Merge branch 'refs/heads/NINJAmaster' into TimelineUber

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

Signed-off-by: Jonathan Duran <jduran@motorola.com>

9 files changed, 111 insertions, 50 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 5d983a93..85a9e963 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -131,14 +131,17 @@ exports.BrushTool = Montage.create(ShapeTool, {
              //start a new brush stroke
              if (this._selectedBrushStroke === null){
                  this._selectedBrushStroke = new BrushStroke();
-                 var colorArray=[0,0,0,0];
-                 var color = this.options.fill.color;
-                 if (color){
-                     colorArray = [color.r/255, color.g/255, color.b/255, color.a];
+                 var colorObj;
+                 var fill = this.options.fill;
+                 var color = fill.color;
+                 if(fill.colorMode === "gradient") {
+                     colorObj = {gradientMode:fill.color.gradientMode, color:fill.color.stops};
+                 } else if (color) {
+                     colorObj = [color.r/255, color.g/255, color.b/255, color.a];
                  } else {
-                     colorArray = [1,1,1,0];
+                     colorObj = [1,1,1,0];
                  }
-                 this._selectedBrushStroke.setFillColor(colorArray);
+                 this._selectedBrushStroke.setFillColor(colorObj);
 
                  //add this point to the brush stroke in case the user does a mouse up before doing a mouse move
                  var currMousePos = hitRec.calculateStageWorldPoint();
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index e08ec1da..72e03379 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -12,7 +12,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase,
-    ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
+    ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
+    ShapesController = require("js/controllers/elements/shapes-controller").ShapesController;
 
 exports.FillTool = Montage.create(ModifierToolBase, {
         _canSnap: { value: false },
@@ -28,7 +29,7 @@ exports.FillTool = Montage.create(ModifierToolBase, {
             if (obj)
             {
                 var name = obj.nodeName;
-                if ((name !== 'CANVAS') && (name !== 'DIV'))
+                if ( ((name !== 'CANVAS') && (name !== 'DIV')) || (ShapesController.isElementAShape(obj) && !obj.elementModel.shapeModel.GLGeomObj.canFill))
                 {
                     cursor = "url('images/cursors/nofill.png') 14 14, default";
                     canColor = false;
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 07429bc0..413c0302 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -44,10 +44,16 @@ exports.LineTool = Montage.create(ShapeTool, {
             }
 
             this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null);
-            if (this.options.stroke.color)
-                this._strokeColor = this.options.stroke.color.css;
-                        else
-                                this._strokeColor = [0,0,0,1];
+            if (this.options.stroke.color) {
+                if( (this.options.stroke.colorMode === "gradient") || (this.options.stroke.colorMode === "nocolor") ) {
+                    this._strokeColor = [0,0,0,1];
+                } else {
+                    this._strokeColor = this.options.stroke.color.css;
+                }
+            } else {
+                this._strokeColor = [0,0,0,1];
+            }
+
             this.startDraw(event);
         }
     },
@@ -229,10 +235,11 @@ exports.LineTool = Montage.create(ShapeTool, {
             var strokeColor = this.options.stroke.webGlColor;
             // for default stroke and fill/no materials
             var strokeMaterial = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
@@ -270,6 +277,11 @@ exports.LineTool = Montage.create(ShapeTool, {
                 // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
             }
 
+            // TODO - This needs to be moved into geom obj's init routine instead of here
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "lineTool");
+            }
+
             if(canvas.elementModel.isShape)
             {
                 this.application.ninja.selectionController.selectElement(canvas);
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index ce812398..e798d1a7 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -39,23 +39,24 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
             var innerRadius = this.options.innerRadius.value / 100;
 
-            var strokeColor = this.options.stroke.webGlColor;
-            var fillColor = this.options.fill.webGlColor;
-
+            var strokeColor = this.options.stroke.webGlColor || [0,0,0,1];
+            var fillColor = this.options.fill.webGlColor || [1,1,1,1];
             // for default stroke and fill/no materials
             var strokeMaterial = null;
             var fillMaterial = null;
+            var fillM = null;
+            var strokeM = null;
 
             if(this.options.use3D)
             {
-                var strokeM = this.options.strokeMaterial;
+                strokeM = this.options.strokeMaterial;
                 if(strokeM)
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
                 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
 
-                var fillM = this.options.fillMaterial;
+                fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
@@ -94,6 +95,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 // TODO - update the shape's info only.  shapeModel will likely need an array of shapes.
             }
 
+            // TODO - This needs to be moved into geom obj's init routine instead of here
+            if(!fillM) {
+                this.setColor(canvas, this.options.fill, true, "ovalTool");
+            }
+            if(!strokeM) {
+                this.setColor(canvas, this.options.stroke, false, "ovalTool");
+            }
+
             if(canvas.elementModel.isShape)
             {
                 this.application.ninja.selectionController.selectElement(canvas);
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 2cffb44d..1097f28c 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -338,22 +338,28 @@ exports.PenTool = Montage.create(ShapeTool, {
                 }
                 this._selectedSubpath.setStrokeWidth(strokeSize);
 
-                var colorArray=[];
-                var color = this.options.stroke.color;
-                if (color){
-                    colorArray = [color.r/255, color.g/255, color.b/255, color.a];
-                }else {
-                    colorArray = [1,1,1,0];
+                var colorObj;
+                var stroke = this.options.stroke;
+                var color = stroke.color;
+                if(stroke.colorMode === "gradient") {
+                    colorObj = {gradientMode:stroke.color.gradientMode, color:stroke.color.stops};
+                } else if (color) {
+                    colorObj = [color.r/255, color.g/255, color.b/255, color.a];
+                } else {
+                    colorObj = [1,1,1,0];
                 }
-                this._selectedSubpath.setStrokeColor(colorArray);
-
-                color = this.options.fill.color;
-                if (color){
-                    colorArray = [color.r/255, color.g/255, color.b/255, color.a];
+                this._selectedSubpath.setStrokeColor(colorObj);
+
+                var fill = this.options.fill;
+                color = fill.color;
+                if(fill.colorMode === "gradient") {
+                    colorObj = {gradientMode:fill.color.gradientMode, color:fill.color.stops};
+                } else if (color) {
+                    colorObj = [color.r/255, color.g/255, color.b/255, color.a];
                 } else {
-                    colorArray = [1,1,1,0];
+                    colorObj = [1,1,1,0];
                 }
-                this._selectedSubpath.setFillColor(colorArray);
+                this._selectedSubpath.setFillColor(colorObj);
             } //if the selectedSubpath was null and needed to be constructed
 
             //build the current mouse position in stage world space in case we don't already have a canvas
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index b35a101a..6f0e65c7 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -59,22 +59,24 @@ exports.RectTool = Montage.create(ShapeTool, {
             var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h);
             var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h);
 
-            var strokeColor = this.options.stroke.webGlColor;
-            var fillColor = this.options.fill.webGlColor;
+            var strokeColor = this.options.stroke.webGlColor || [0,0,0,1];
+            var fillColor = this.options.fill.webGlColor || [1,1,1,1];
             // for default stroke and fill/no materials
             var strokeMaterial = null;