aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-19 07:58:10 -0700
committerValerio Virgillito2012-06-19 07:58:10 -0700
commit483ad57efcd6475776f580c3af5b60e6deeaf781 (patch)
tree3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/tools
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
parentc65c532d081afd73e4a325abe4ab97c6726c02db (diff)
downloadninja-483ad57efcd6475776f580c3af5b60e6deeaf781.tar.gz
Merge pull request #298 from ericmueller/Textures
Textures
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/LineTool.js2
-rwxr-xr-xjs/tools/TagTool.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 40475908..07429bc0 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -237,7 +237,7 @@ exports.LineTool = Montage.create(ShapeTool, {
237 { 237 {
238 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 238 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
239 } 239 }
240 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; 240 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
241 } 241 }
242 242
243 var world = this.getGLWorld(canvas, this.options.use3D); 243 var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 508e2a85..fac6798f 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -86,6 +86,7 @@ exports.TagTool = Montage.create(DrawingTool, {
86 // Create the element 86 // Create the element
87 if(this.options.selectedElement === "custom") { 87 if(this.options.selectedElement === "custom") {
88 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument); 88 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument);
89
89 } else { 90 } else {
90 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument); 91 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
91 } 92 }