Merge pull request #3435 from zilongshanren/fix-scale9sprite-scale-issue

add _generateGrayTexture to cc.Texture2D.js

Author: pandamicro

cocos2d/core/textures/CCTexture2D.js

@@ -419,7 +419,17 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
                     if (this._backupElement !== null)
                         this._htmlElementObj = this._backupElement;
                 }
-            }
+            },
+
+            _generateGrayTexture: function() {
+                if(!this._textureLoaded)
+                    return null;
+                var grayElement = cc.Texture2D._generateGrayTexture(this._htmlElementObj);
+                var newTexture = new cc.Texture2D();
+                newTexture.initWithElement(grayElement);
+                newTexture.handleLoadedTexture();
+                return newTexture;
+            },
         };
 
         var renderToCache = function (image, cache) {

extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js

@@ -70,7 +70,7 @@
         if (this._textureToRender === null || this._originalTexture !== locTexture) {
             this._textureToRender = this._originalTexture = locTexture;
             if (cc.Scale9Sprite.state.GRAY === this._state) {
-                this._textureToRender = this._textureToRender._switchToGray();
+                this._textureToRender = this._textureToRender._generateGrayTexture();
             }
             var color = node.getDisplayedColor();
             if (locTexture && (color.r !== 255 || color.g !==255 || color.b !== 255))