Merge pull request cocos2d#3080 from VisualSJ/develop-bakeAndF

pandamicro · pandamicro · commit d7d08fca58b6 · 2015-08-25T16:17:51.000+08:00
Fixed a bug that bake, setContentScaleFactor can not be used simultan…
diff --git a/cocos2d/core/sprites/CCBakeSprite.js b/cocos2d/core/sprites/CCBakeSprite.js
@@ -73,6 +73,6 @@ cc.BakeSprite = cc.Sprite.extend(/** @lends cc.BakeSprite# */{
         if(fillStyle !== locContext._context.fillStyle)
             locContext._context.fillStyle = fillStyle;
         this.getTexture().handleLoadedTexture();
-        this.setTextureRect(cc.rect(0,0, sizeOrWidth, height), false);
+        this.setTextureRect(cc.rect(0,0, sizeOrWidth, height), false, null, false);
     }
 });

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ cc.BakeSprite = cc.Sprite.extend(/** @lends cc.BakeSprite# */{`
`73`	`73`	`if(fillStyle !== locContext._context.fillStyle)`
`74`	`74`	`locContext._context.fillStyle = fillStyle;`
`75`	`75`	`this.getTexture().handleLoadedTexture();`
`76`		`- this.setTextureRect(cc.rect(0,0, sizeOrWidth, height), false);`
	`76`	`+ this.setTextureRect(cc.rect(0,0, sizeOrWidth, height), false, null, false);`
`77`	`77`	`}`
`78`	`78`	`});`