Merge pull request #3518 from pandamicro/develop

reorderChild can update arrival order

Author: pandamicro

cocos2d/core/base-nodes/CCNode.js

@@ -306,6 +306,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @param {Number} localZOrder
      */
     setLocalZOrder: function (localZOrder) {
+        if (localZOrder === this._localZOrder)
+            return;
         if (this._parent)
             this._parent.reorderChild(this, localZOrder);
         else
@@ -1365,9 +1367,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
             cc.log(cc._LogInfos.Node_reorderChild_2);
             return;
         }
-        if (zOrder === child.zIndex) {
-            return;
-        }
         cc.renderer.childrenOrderDirty = this._reorderChildDirty = true;
         child.arrivalOrder = cc.s_globalOrderOfArrival;
         cc.s_globalOrderOfArrival++;

cocos2d/particle/CCParticleBatchNode.js

@@ -278,9 +278,6 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
             return;
         }
 
-        if (zOrder === child.zIndex)
-            return;
-
         // no reordering if only 1 child
         if (this._children.length > 1) {
             var getIndexes = this._getCurrentIndex(child, zOrder);