aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/content.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/properties/content.reel')
-rwxr-xr-xjs/panels/properties/content.reel/content.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 8fa33a75..fa4c56f2 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -268,12 +268,12 @@ exports.Content = Montage.create(Component, {
268 } 268 }
269 else 269 else
270 { 270 {
271 if (currentValue.color.a !== undefined) 271 if (currentValue.color && (currentValue.color.a !== undefined))
272 { 272 {
273 this.application.ninja.colorController.colorModel.alpha = 273 this.application.ninja.colorController.colorModel.alpha =
274 {value: currentValue.color.a, wasSetByCode: true, type: 'change'}; 274 {value: currentValue.color.a, wasSetByCode: true, type: 'change'};
275 } 275 }
276 if(currentValue.color.mode) 276 if(currentValue.color && currentValue.color.mode)
277 { 277 {
278 this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color; 278 this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
279 } 279 }