diff options
author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
tree | 0ad3e94248a1d4828386c8743a670c709357a470 /js/panels/properties.reel/properties.js | |
parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 43c92b74..fcd0ab01 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -367,7 +367,7 @@ exports.Properties = Montage.create(Component, { | |||
367 | } | 367 | } |
368 | } else { | 368 | } else { |
369 | this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'}; | 369 | this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'}; |
370 | this.application.ninja.colorController.colorModel.applyNoColor(); | 370 | this.application.ninja.colorController.colorModel.applyNoColor(true); |
371 | } | 371 | } |
372 | } | 372 | } |
373 | } | 373 | } |
@@ -397,7 +397,7 @@ exports.Properties = Montage.create(Component, { | |||
397 | this.application.ninja.colorController.colorModel.hsv = color.c; | 397 | this.application.ninja.colorController.colorModel.hsv = color.c; |
398 | break; | 398 | break; |
399 | default: | 399 | default: |
400 | this.application.ninja.colorController.colorModel.applyNoColor(); | 400 | this.application.ninja.colorController.colorModel.applyNoColor(true); |
401 | break; | 401 | break; |
402 | } | 402 | } |
403 | } | 403 | } |