Merge branch 'refs/heads/ninja-internal' into WebGLFileIO

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 1bf8c2e5..157f4c4a 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -942,6 +942,7 @@ World.prototype.importObjectsJSON = function( jObj,  parentGeomObj )
 World.prototype.importObjectJSON = function( jObj, parentGeomObj )
 {
         var type = jObj.type;
+    var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
 
         var obj;
         switch (type)
@@ -961,6 +962,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
             obj.importJSON( jObj );
             break;
 
+        case 6:     //brush stroke
+            obj = new BrushStroke();
+            obj.importJSON(jObj);
+            break;
+
                 default:
                         throw new Error( "Unrecognized object type: " + type );
                         break;