Merge branch 'refs/heads/NINJAmaster' into TimelineUber

2 files changed, 7 insertions, 3 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, {
                                 }
                             } else {
                                 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                                this.application.ninja.colorController.colorModel.applyNoColor();
+                                this.application.ninja.colorController.colorModel.applyNoColor(true);
                             }
                         }
                     }
@@ -398,7 +398,7 @@ exports.Properties = Montage.create(Component, {
                                         this.application.ninja.colorController.colorModel.hsv = color.c;
                                         break;
                                 default:
-                                        this.application.ninja.colorController.colorModel.applyNoColor();
+                                        this.application.ninja.colorController.colorModel.applyNoColor(true);
                                         break;
                         }
             }
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index c599dcb0..08434b01 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -116,7 +116,11 @@ exports.CustomSection = Montage.create(Component, {
         value: function(event) {
             // Change the stage color for now
             //console.log(this, event);
-            ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
+            if (event._event.color && event._event.color.css) {
+                ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
+            } else {
+                    ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", '');
+            }
             /*
             var propEvent = document.createEvent("CustomEvent");
             propEvent.initEvent("propertyChange", true, true);