Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 19 insertions, 11 deletions

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 94e4745e..970dc453 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -28,31 +28,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage =   require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
-    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
+    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 
 var Circle = require("js/lib/geom/circle").Circle;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 exports.OvalTool = Montage.create(ShapeTool, {
 
-        _toolID: { value: "ovalTool" },
-        _imageID: { value: "ovalToolImg" },
-        _toolImageClass: { value: "ovalToolUp" },
-        _selectedToolImageClass: { value: "ovalToolDown" },
-        _toolTipText: { value: "Oval Tool (O)" },
+    _toolID: { value: "ovalTool" },
+    _imageID: { value: "ovalToolImg" },
+    _toolImageClass: { value: "ovalToolUp" },
+    _selectedToolImageClass: { value: "ovalToolDown" },
+    _toolTipText: { value: "Oval Tool (O)" },
     _selectedToolClass:{value:"ovalToolSpecificProperties"},
     _ovalView : { value: null, writable: true},
 
     RenderShape: {
-                value: function (w, h, planeMat, midPt, canvas)
+        value: function (w, h, planeMat, midPt, canvas)
         {
             if( (Math.floor(w) === 0) || (Math.floor(h) === 0) )
             {
                 return;
             }
-            
+
             var left = Math.round(midPt[0] - 0.5*w);
             var top = Math.round(midPt[1] - 0.5*h);
 
@@ -78,14 +78,22 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
+                    strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
+                } else {
+                    strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                }
 
                 fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                if (fillMaterial && this.options.fill.color && (fillMaterial.gradientType === this.options.fill.color.gradientMode)) {
+                    fillColor = {gradientMode:fillMaterial.gradientType, color:this.options.fill.color.stops};
+                } else {
+                    fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);