aboutsummaryrefslogtreecommitdiff
path: root/js/tools/OvalTool.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-02 14:52:14 -0700
committerNivesh Rajbhandari2012-04-02 14:52:14 -0700
commit5377e963c4413640cd3c04e0406384df04144568 (patch)
tree75a6c9e74ad45648f880107609b644bbb65fcc2a /js/tools/OvalTool.js
parentc4e83a61311db75c7a1c307553262e77ecaae662 (diff)
downloadninja-5377e963c4413640cd3c04e0406384df04144568.tar.gz
Switching to Linear/RadialGradient materials will set the corresponding color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/OvalTool.js')
-rwxr-xr-xjs/tools/OvalTool.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index c09c9bc7..e8e88d1d 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -53,14 +53,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
53 { 53 {
54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
55 } 55 }
56 strokeColor = this._getMaterialColor(strokeM) || strokeColor; 56 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
57 57
58 var fillM = this.options.fillMaterial; 58 var fillM = this.options.fillMaterial;
59 if(fillM) 59 if(fillM)
60 { 60 {
61 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 61 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
62 } 62 }
63 fillColor = this._getMaterialColor(fillM) || fillColor; 63 fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
64 } 64 }
65 65
66 var world = this.getGLWorld(canvas, this.options.use3D); 66 var world = this.getGLWorld(canvas, this.options.use3D);