aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/panels/properties.reel/properties.js
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-xjs/panels/properties.reel/properties.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 4aaeda93..5719a63d 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -368,7 +368,7 @@ exports.Properties = Montage.create(Component, {
368 } 368 }
369 } else { 369 } else {
370 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'}; 370 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
371 this.application.ninja.colorController.colorModel.applyNoColor(); 371 this.application.ninja.colorController.colorModel.applyNoColor(true);
372 } 372 }
373 } 373 }
374 } 374 }
@@ -398,7 +398,7 @@ exports.Properties = Montage.create(Component, {
398 this.application.ninja.colorController.colorModel.hsv = color.c; 398 this.application.ninja.colorController.colorModel.hsv = color.c;
399 break; 399 break;
400 default: 400 default:
401 this.application.ninja.colorController.colorModel.applyNoColor(); 401 this.application.ninja.colorController.colorModel.applyNoColor(true);
402 break; 402 break;
403 } 403 }
404 } 404 }