Merge pull request #379 from rschamp/bugfix/empty-rotation-center

Only update costume rotationCenter if it exists
scratchfoundation · Jan 13, 2017 · c6c4c4c · c6c4c4c
2 parents 9b04392 + a56346d
commit c6c4c4c
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/sprites/rendered-target.js b/src/sprites/rendered-target.js
@@ -329,18 +329,21 @@ RenderedTarget.prototype.setCostume = function (index) {
     );
     if (this.renderer) {
         var costume = this.sprite.costumes[this.currentCostume];
-        var rotationCenter = costume.bitmapResolution ? [
-            costume.rotationCenterX / costume.bitmapResolution,
-            costume.rotationCenterY / costume.bitmapResolution
-        ] : [
-            costume.rotationCenterX,
-            costume.rotationCenterY
-        ];
-        this.renderer.updateDrawableProperties(this.drawableID, {
+        var drawableProperties = {
             skin: costume.skin,
-            costumeResolution: costume.bitmapResolution,
-            rotationCenter: rotationCenter
-        });
+            costumeResolution: costume.bitmapResolution
+        };
+        if (
+            typeof costume.rotationCenterX !== 'undefined' &&
+            typeof costume.rotationCenterY !== 'undefined'
+        ) {
+            var scale = costume.bitmapResolution || 1;
+            drawableProperties.rotationCenter = [
+                costume.rotationCenterX / scale,
+                costume.rotationCenterY / scale
+            ];
+        }
+        this.renderer.updateDrawableProperties(this.drawableID, drawableProperties);
         if (this.visible) {
             this.runtime.requestRedraw();
         }