aboutsummaryrefslogtreecommitdiff
path: root/js/tools/FillTool.js
diff options
context:
space:
mode:
authorhwc4872012-02-21 17:02:31 -0800
committerhwc4872012-02-21 17:02:31 -0800
commitf06f44ab3fcca109f126eae4f6fb915c5dd28791 (patch)
treec25fbfedf93c135be53f1e9238f7ddcf498612bc /js/tools/FillTool.js
parentbd7bc833895391e4974b8746f31f63ba70689df3 (diff)
parentd2f4d5e5f6742d53b6324d585a700566f73c992a (diff)
downloadninja-f06f44ab3fcca109f126eae4f6fb915c5dd28791.tar.gz
Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integration
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-xjs/tools/FillTool.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index fabcec69..46d76a19 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -63,15 +63,14 @@ exports.FillTool = Montage.create(ModifierToolBase, {
63 colorInfo = { mode:color.colorMode, 63 colorInfo = { mode:color.colorMode,
64 color:color.color 64 color:color.color
65 }; 65 };
66 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
67 } 66 }
68 else 67 else
69 { 68 {
70 colorInfo = { mode:"nocolor", 69 colorInfo = { mode:"nocolor",
71 color:color.color 70 color:color.color
72 }; 71 };
73 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
74 } 72 }
73 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
75 } 74 }
76 } 75 }
77 } 76 }