Merge branch 'develop' of github.com:anlide/cocos2d-html5 into legend

pandamicro · pandamicro · commit e666a010ca28 · 2016-12-06T12:37:37.000+08:00
# Conflicts:
#	cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
diff --git a/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
@@ -230,6 +230,10 @@ cc.Node.RenderCmd.prototype = {
                 }
             }
 
+            if (node._additionalTransformDirty) {
+                cc.affineTransformConcatIn(t, node._additionalTransform);
+            }
+
             if (pt) {
                 // cc.AffineTransformConcat is incorrect at get world transform
                 wt.a = t.a * pt.a + t.b * pt.c;                               //a
@@ -265,6 +269,10 @@ cc.Node.RenderCmd.prototype = {
                 }
             }
 
+            if (node._additionalTransformDirty) {
+                cc.affineTransformConcatIn(t, node._additionalTransform);
+            }
+
             if (pt) {
                 wt.a = t.a * pt.a + t.b * pt.c;
                 wt.b = t.a * pt.b + t.b * pt.d;
@@ -282,10 +290,6 @@ cc.Node.RenderCmd.prototype = {
             }
         }
 
-        if (node._additionalTransformDirty) {
-            cc.affineTransformConcatIn(t, node._additionalTransform);
-        }
-
         if (this._updateCurrentRegions) {
             this._updateCurrentRegions();
             this._notifyRegionStatus && this._notifyRegionStatus(cc.Node.CanvasRenderCmd.RegionStatus.DirtyDouble);

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,10 @@ cc.Node.RenderCmd.prototype = {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
	`233`	`+ if (node._additionalTransformDirty) {`
	`234`	`+ cc.affineTransformConcatIn(t, node._additionalTransform);`
	`235`	`+ }`
	`236`	`+`
`233`	`237`	`if (pt) {`
`234`	`238`	`// cc.AffineTransformConcat is incorrect at get world transform`
`235`	`239`	`wt.a = t.a * pt.a + t.b * pt.c; //a`
`@@ -265,6 +269,10 @@ cc.Node.RenderCmd.prototype = {`
`265`	`269`	`}`
`266`	`270`	`}`
`267`	`271`
	`272`	`+ if (node._additionalTransformDirty) {`
	`273`	`+ cc.affineTransformConcatIn(t, node._additionalTransform);`
	`274`	`+ }`
	`275`	`+`
`268`	`276`	`if (pt) {`
`269`	`277`	`wt.a = t.a * pt.a + t.b * pt.c;`
`270`	`278`	`wt.b = t.a * pt.b + t.b * pt.d;`
`@@ -282,10 +290,6 @@ cc.Node.RenderCmd.prototype = {`
`282`	`290`	`}`
`283`	`291`	`}`
`284`	`292`
`285`		`- if (node._additionalTransformDirty) {`
`286`		`- cc.affineTransformConcatIn(t, node._additionalTransform);`
`287`		`- }`
`288`		`-`
`289`	`293`	`if (this._updateCurrentRegions) {`
`290`	`294`	`this._updateCurrentRegions();`
`291`	`295`	`this._notifyRegionStatus && this._notifyRegionStatus(cc.Node.CanvasRenderCmd.RegionStatus.DirtyDouble);`