From d77b87ed22d9a76bd4b4ba44676a15c0d3d4c683 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Thu, 25 Sep 2014 13:12:47 -0700 Subject: [PATCH] Fixed raster thang types, and level destruction. --- app/lib/surface/Label.coffee | 5 +++-- app/lib/surface/LayerAdapter.coffee | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/lib/surface/Label.coffee b/app/lib/surface/Label.coffee index 30829d372..c4a9a51b1 100644 --- a/app/lib/surface/Label.coffee +++ b/app/lib/surface/Label.coffee @@ -35,8 +35,9 @@ module.exports = class Label extends CocoClass true build: -> - @layer.removeChild @background if @background - @layer.removeChild @label if @label + if @layer and not @layer.destroyed + @layer.removeChild @background if @background + @layer.removeChild @label if @label @label = null @background = null return unless @text # null or '' should both be skipped diff --git a/app/lib/surface/LayerAdapter.coffee b/app/lib/surface/LayerAdapter.coffee index ede5307e0..b15f1c67b 100644 --- a/app/lib/surface/LayerAdapter.coffee +++ b/app/lib/surface/LayerAdapter.coffee @@ -439,6 +439,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass # just give a placeholder sprite = new createjs.Sprite(@spriteSheet) sprite.placeholder = true + sprite.baseScaleX = sprite.baseScaleY = 1 else if cocoSprite.thangType.get('raster') sprite = new createjs.Sprite(@spriteSheet) @@ -446,6 +447,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass sprite.regX = -reg.x sprite.regY = -reg.y sprite.gotoAndStop(@renderGroupingKey(cocoSprite.thangType)) + sprite.baseScaleX = sprite.baseScaleY = 1 else SpriteClass = if (cocoSprite.thangType.get('spriteType') or @defaultSpriteType) is 'segmented' then SegmentedSprite else SingularSprite