From 853a80dd23afb17d0e99bcd6329f9a59bbfd652e Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Wed, 12 Mar 2014 12:43:51 -0700
Subject: [PATCH] Fixed loading marks so they are positioned correctly when
they load and the world is paused.
---
app/lib/surface/CocoSprite.coffee | 2 +-
app/views/editor/thang/edit.coffee | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index 54b94adc6..131839b27 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -172,7 +172,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
return if @stillLoading
@updatePosition()
if frameChanged
- @updateScale()
+ @updateScale() # must happen before rotation
@updateAlpha()
@updateRotation()
@updateAction()
diff --git a/app/views/editor/thang/edit.coffee b/app/views/editor/thang/edit.coffee
index 03babdfd4..23fa7f38d 100644
--- a/app/views/editor/thang/edit.coffee
+++ b/app/views/editor/thang/edit.coffee
@@ -270,7 +270,7 @@ module.exports = class ThangTypeEditView extends View
@$el.find('.rotation-label').text " #{value}° "
if @currentSprite
@currentSprite.rotation = value
- @currentSprite.update()
+ @currentSprite.update(true)
updateScale: =>
value = (@scaleSlider.slider('value') + 1) / 10