Skip to content

Commit 4a3607a

Browse files
authored
Merge pull request cocos2d#3320 from pandamicro/develop
Revert change to cc.Node getNodeToWorldTransform
2 parents c684dcf + e8389a3 commit 4a3607a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cocos2d/core/base-nodes/CCNode.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,9 +1903,10 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
19031903
* @return {cc.AffineTransform}
19041904
*/
19051905
getNodeToWorldTransform: function () {
1906-
// Update the transform is needed
1907-
this._renderCmd.getNodeToParentTransform();
1908-
return this._renderCmd._worldTransform;
1906+
var t = this.getNodeToParentTransform();
1907+
for (var p = this._parent; p !== null; p = p.parent)
1908+
t = cc.affineTransformConcat(t, p.getNodeToParentTransform());
1909+
return t;
19091910
},
19101911

19111912
/**

0 commit comments

Comments
 (0)