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

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 2fa5411b..14655312 100644
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -43,16 +43,16 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var strokeMaterial = null;
             var fillMaterial = null;
 
-            var strokeIndex = parseInt(this.options.strokeMaterial);
-            if(strokeIndex > 0)
+            var strokeM = this.options.strokeMaterial;
+            if(strokeM)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1));
+                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
             }
 
-            var fillIndex = parseInt(this.options.fillMaterial);
-            if(fillIndex > 0)
+            var fillM = this.options.fillMaterial;
+            if(fillM)
             {
-                fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1));
+                fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
             }
 
 
@@ -88,13 +88,12 @@ exports.OvalTool = Montage.create(ShapeTool, {
 
                 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
                 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
-                canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
-                canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
 
                 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = oval;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {