Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

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

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 5e9c792b..5520fa89 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -92,6 +92,11 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Create the styles
             styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData);
 
+            // Add color
+            if(this.options.getProperty("fill.colorMode") !== "nocolor") {
+                styles['background-color'] = this.options.getProperty("fill.color.css");
+            }
+
             // Add the element and styles
             this.application.ninja.elementMediator.addElements(element, styles);
         }