aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-18 22:17:02 -0700
committerValerio Virgillito2012-06-18 22:17:02 -0700
commit918a4f5870e972b6e4e301c3237e065a1ffd26f5 (patch)
tree86a13e3a9cbcc46abc2ca6bc2cf8c90f77711ed1 /js/panels/properties.reel/properties.js
parentaefeb5f96bf6e8e993ce44c4f328b56e39196414 (diff)
parent69f69c7bf43bdd9a80d8efe329cd648f975f14e9 (diff)
downloadninja-918a4f5870e972b6e4e301c3237e065a1ffd26f5.tar.gz
Merge pull request #308 from joseeight/Color
Fixing no color application to all elements.
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 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 }