Merge remote-tracking branch 'ninja-internal/master' into Timeline-local

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 14 insertions, 1 deletions

diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 9b6416c7..8fa33a75 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -255,6 +255,12 @@ exports.Content = Montage.create(Component, {
 
                             if(currentValue)
                             {
+                                if(currentValue.color)
+                                {
+                                    currentValue.color.wasSetByCode = true;
+                                    currentValue.color.type = "change";
+                                }
+
                                 if(currentValue.mode === "gradient")
                                 {
                                     this.application.ninja.colorController.colorModel["gradient"] =
@@ -267,7 +273,14 @@ exports.Content = Montage.create(Component, {
                                         this.application.ninja.colorController.colorModel.alpha =
                                                         {value: currentValue.color.a, wasSetByCode: true, type: 'change'};
                                     }
-                                    this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
+                                    if(currentValue.color.mode)
+                                    {
+                                        this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
+                                    }
+                                    else
+                                    {
+                                        this.application.ninja.colorController.colorModel["rgb"] = currentValue.color;
+                                    }
                                 }
                             }
                             else