diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js index e92b5d6314..efd7ee1257 100644 --- a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js +++ b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js @@ -165,7 +165,7 @@ proto._cangodhelpme = function (godhelpme) { proto.visit = function(parentCmd){ var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js index ad4498a9bd..c610683f41 100644 --- a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js +++ b/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js @@ -81,7 +81,7 @@ proto.transform = function(parentCmd, recursive){ proto.visit = function(parentCmd){ var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js index 45a7e7ebb1..a3c946a850 100644 --- a/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js @@ -334,7 +334,7 @@ _ccsg.Node.RenderCmd.prototype = { } return this._transform; }, - _propagateFlags: function(parentCmd) { + _propagateFlagsDown: function(parentCmd) { //return; var flags = _ccsg.Node._dirtyFlags, locFlag = this._dirtyFlag; var parentNode = parentCmd ? parentCmd._node : null; @@ -454,7 +454,7 @@ proto.transform = function (parentCmd, recursive) { proto.visit = function (parentCmd) { var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js index 76eeec03c9..8f0d6bac10 100644 --- a/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js @@ -45,7 +45,7 @@ proto._updateColor = function(){}; proto.visit = function (parentCmd) { var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/core/layers/CCLayerCanvasRenderCmd.js b/cocos2d/core/layers/CCLayerCanvasRenderCmd.js index 1cc5b11993..5d53fef903 100644 --- a/cocos2d/core/layers/CCLayerCanvasRenderCmd.js +++ b/cocos2d/core/layers/CCLayerCanvasRenderCmd.js @@ -143,7 +143,7 @@ var node = this._node, children = node._children; var len = children.length; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible || len === 0) return; @@ -295,7 +295,7 @@ } var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js b/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js index 2c2a11c9ac..a7ac4cd4e7 100644 --- a/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js +++ b/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js @@ -60,7 +60,7 @@ proto.rendering = function () { proto.visit = function(parentCmd){ var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); // quick return if not visible if (!node._visible) return; diff --git a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js index f7d847689d..27ff89195a 100644 --- a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js +++ b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js @@ -125,7 +125,7 @@ proto.getTexture = function(){ proto.visit = function(parentCmd){ var node = this._node; - this._propagateFlags(parentCmd); + this._propagateFlagsDown(parentCmd); //TODO: it will implement dynamic compute child cutting automation. var i, len, locChildren = node._children; // quick return if not visible