diff options
author | Jose Antonio Marquez | 2012-02-23 15:27:10 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-23 15:27:10 -0800 |
commit | ad7ae032bc55198e16a02dc75aa15303c033ea58 (patch) | |
tree | 85cd7ab1c3191b55c38e830440eab84c92d76d39 /js/panels/properties/content.reel/content.js | |
parent | bdc39718cacad2eab10a7d031ea10fda13c92a03 (diff) | |
parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
download | ninja-ad7ae032bc55198e16a02dc75aa15303c033ea58.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/panels/properties/content.reel/content.js')
-rwxr-xr-x | js/panels/properties/content.reel/content.js | 15 |
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, { | |||
255 | 255 | ||
256 | if(currentValue) | 256 | if(currentValue) |
257 | { | 257 | { |
258 | if(currentValue.color) | ||
259 | { | ||
260 | currentValue.color.wasSetByCode = true; | ||
261 | currentValue.color.type = "change"; | ||
262 | } | ||
263 | |||
258 | if(currentValue.mode === "gradient") | 264 | if(currentValue.mode === "gradient") |
259 | { | 265 | { |
260 | this.application.ninja.colorController.colorModel["gradient"] = | 266 | this.application.ninja.colorController.colorModel["gradient"] = |
@@ -267,7 +273,14 @@ exports.Content = Montage.create(Component, { | |||
267 | this.application.ninja.colorController.colorModel.alpha = | 273 | this.application.ninja.colorController.colorModel.alpha = |
268 | {value: currentValue.color.a, wasSetByCode: true, type: 'change'}; | 274 | {value: currentValue.color.a, wasSetByCode: true, type: 'change'}; |
269 | } | 275 | } |
270 | this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color; | 276 | if(currentValue.color.mode) |
277 | { | ||
278 | this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color; | ||
279 | } | ||
280 | else | ||
281 | { | ||
282 | this.application.ninja.colorController.colorModel["rgb"] = currentValue.color; | ||
283 | } | ||
271 | } | 284 | } |
272 | } | 285 | } |
273 | else | 286 | else |