Merge pull request #3363 from pandamicro/develop

Fix rendering issues

Author: pandamicro

cocos2d/core/renderer/RendererCanvas.js

@@ -418,7 +418,7 @@ cc.rendererCanvas = {
             //ugly for armature
             this.restore();
             this.save();
-            this._context.transform(t.a, -t.b, -t.c, t.d, t.tx * scaleX, -(t.ty * scaleY));
+            this._context.transform(t.a * scaleX, -t.b * scaleY, -t.c * scaleX, t.d * scaleY, t.tx * scaleX, -(t.ty * scaleY));
         } else {
             this._context.setTransform(t.a * scaleX, -t.b * scaleY, -t.c * scaleX, t.d * scaleY, this._offsetX + t.tx * scaleX, this._realOffsetY - (t.ty * scaleY));
         }

cocos2d/core/sprites/CCSprite.js

@@ -293,6 +293,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
         locRect.y = rect.y;
         locRect.width = rect.width;
         locRect.height = rect.height;
+        this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
     },
 
     /**

extensions/gui/scrollview/CCScrollViewCanvasRenderCmd.js

@@ -79,5 +79,7 @@
             }
         }
         cc.renderer.pushRenderCommand(this.endCmd);
+        
+        this._dirtyFlag = 0;
     };
 })();