diff options
| author | hwc487 | 2012-05-14 10:00:52 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-14 10:00:52 -0700 |
| commit | 5fcb96cae89007c684df3ce948831e2fcf9fd8b7 (patch) | |
| tree | f179b73bdc878d7f5a6799b2b1826e836168b805 /js/tools | |
| parent | 137bfc9d4c41cc918d969565bec28a834fe10472 (diff) | |
| download | ninja-5fcb96cae89007c684df3ce948831e2fcf9fd8b7.tar.gz | |
Fixing merge issues
Diffstat (limited to 'js/tools')
| -rwxr-xr-x | js/tools/LineTool.js | 2 | ||||
| -rwxr-xr-x | js/tools/OvalTool.js | 4 | ||||
| -rwxr-xr-x | js/tools/RectTool.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 6621d18b..d5bfa38a 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
| @@ -226,7 +226,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
| 226 | { | 226 | { |
| 227 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 227 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
| 228 | } | 228 | } |
| 229 | strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor; | 229 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | var world = this.getGLWorld(canvas, this.options.use3D); | 232 | var world = this.getGLWorld(canvas, this.options.use3D); |
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index 917da538..e9dc66bb 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 = ShapesController.getMaterialColor(strokeMaterial) || 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 = ShapesController.getMaterialColor(fillMaterial) || 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); |
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index a8c57688..0a3c8200 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
| @@ -72,14 +72,14 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
| 72 | { | 72 | { |
| 73 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 73 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
| 74 | } | 74 | } |
| 75 | strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor; | 75 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; |
| 76 | 76 | ||
| 77 | var fillM = this.options.fillMaterial; | 77 | var fillM = this.options.fillMaterial; |
| 78 | if(fillM) | 78 | if(fillM) |
| 79 | { | 79 | { |
| 80 | fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); | 80 | fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); |
| 81 | } | 81 | } |
| 82 | fillColor = ShapesController.getMaterialColor(fillMaterial) || fillColor; | 82 | fillColor = ShapesController.getMaterialColor(fillM) || fillColor; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | var world = this.getGLWorld(canvas, this.options.use3D); | 85 | var world = this.getGLWorld(canvas, this.options.use3D); |