Merge pull request #2697 from dingpinglv/Iss2416_SpriteBug

Fixed #2416: fixed a bug of cc.Sprite in setTextureRect

Author: dingpinglv

cocos2d/core/labelttf/CCLabelTTF.js

@@ -642,7 +642,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
             this._dimensions.width = width;
             this._dimensions.height = height;
             this._updateString();
-            // Force udpate
+            // Force update
             this._setUpdateTextureDirty();
         }
     },
@@ -654,7 +654,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
         if (width != this._dimensions.width) {
             this._dimensions.width = width;
             this._updateString();
-            // Force udpate
+            // Force update
             this._setUpdateTextureDirty();
         }
     },
@@ -666,7 +666,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
         if (height != this._dimensions.height) {
             this._dimensions.height = height;
             this._updateString();
-            // Force udpate
+            // Force update
             this._setUpdateTextureDirty();
         }
     },

cocos2d/core/sprites/CCSprite.js

@@ -759,14 +759,14 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
         _t.setVertexRect(rect);
         _t._renderCmd._setTextureCoords(rect, needConvert);
 
-        var relativeOffset = _t._unflippedOffsetPositionFromCenter;
+        var relativeOffsetX = _t._unflippedOffsetPositionFromCenter.x, relativeOffsetY = _t._unflippedOffsetPositionFromCenter.y;
         if (_t._flippedX)
-            relativeOffset.x = -relativeOffset.x;
+            relativeOffsetX = -relativeOffsetX;
         if (_t._flippedY)
-            relativeOffset.y = -relativeOffset.y;
+            relativeOffsetY = -relativeOffsetY;
         var locRect = _t._rect;
-        _t._offsetPosition.x = relativeOffset.x + (_t._contentSize.width - locRect.width) / 2;
-        _t._offsetPosition.y = relativeOffset.y + (_t._contentSize.height - locRect.height) / 2;
+        _t._offsetPosition.x = relativeOffsetX + (_t._contentSize.width - locRect.width) / 2;
+        _t._offsetPosition.y = relativeOffsetY + (_t._contentSize.height - locRect.height) / 2;
 
         // rendering using batch node
         if (_t._batchNode) {