Merge branch 'refs/heads/master' into minorFixes_7.1

5 files changed, 2 insertions, 8 deletions

diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 748e26dd..11372d12 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -34,7 +34,6 @@ var Material            = require("js/lib/rdge/materials/material").Material;
 var GLWorld             = require("js/lib/drawing/world").World;
 var Texture             = require("js/lib/rdge/texture").Texture;
 var ElementMediator     = require("js/mediators/element-mediator").ElementMediator;
-var TagTool             = require("js/tools/TagTool").TagTool;
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
@@ -152,8 +151,7 @@ var CloudMaterial = function CloudMaterial()
 
         //////////////////////////////////////////////////////////////////////////////////
         // IS THIS NECESSARY??
-//        var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height,
-//                                                                        Matrix.I(4), [0,0,0], srcCanvas);
+//        var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height, Matrix.I(4), [0,0,0], srcCanvas);
 //        ElementMediator.addElement(srcCanvas, elementModel.data, true);
         //////////////////////////////////////////////////////////////////////////////////
 
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 17a99697..f9706277 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
 var Montage = require("montage/core/core").Montage;
 var NJUtils = require("js/lib/NJUtils").NJUtils;
 var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
-var TagTool = require("js/tools/TagTool").TagTool;
 var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
 var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 4ec327b5..26222bc7 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -33,7 +33,6 @@ var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
     DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
     NJUtils = require("js/lib/NJUtils").NJUtils,
-    TagTool = require("js/tools/TagTool").TagTool,
     ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel = require("js/models/shape-model").ShapeModel;
 
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index a44438ac..1ebc7e83 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
 var Montage = require("montage/core/core").Montage;
 var NJUtils = require("js/lib/NJUtils").NJUtils;
 var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
-var TagTool = require("js/tools/TagTool").TagTool;
 var ElementController = require("js/controllers/elements/element-controller").ElementController;
 var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index e1ca31e6..a4fd98e6 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -33,8 +33,7 @@ var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
-    ShapeModel    = require("js/models/shape-model").ShapeModel,
-    TagTool = require("js/tools/TagTool").TagTool;
+    ShapeModel    = require("js/models/shape-model").ShapeModel;
 
 var World = require("js/lib/drawing/world").World;