Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/preloader/Preloader.js

1 files changed, 3 insertions, 1 deletions

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 29e9b99f..d3a36163 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -14,6 +14,8 @@ var Montage = require("montage/core/core").Montage,
     ShapeModel    = require("js/models/shape-model").ShapeModel,
     TagTool = require("js/tools/TagTool").TagTool;
 
+var World = require("js/lib/drawing/world").World;
+
 exports.ShapeTool = Montage.create(DrawingTool, {
     drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } },
 
@@ -176,7 +178,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
             if(!world)
             {
                 // create all the GL stuff
-                var world = new GLWorld(canvas, use3D);
+                var world = new World(canvas, use3D);
                 ElementMediator.setShapeProperty(canvas, "GLWorld", world);
             }