1 files changed, 22 insertions, 5 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 781695b6..5a054224 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -761,13 +761,10 @@ World.prototype.exportJSON = function()
         // We need to rebuild everything
         if (this._useWebGL)
         {
-                var root = this._rootNode;
-                root.children = new Array();
                 if (worldObj.children && (worldObj.children.length === 1))
                 {
-                        this.init();
-                        this._geomRoot = undefined;
-                        this.importObjectsJSON( worldObj.children[0] );
+            this.rebuildTree(this._geomRoot);
+            this.restartRenderLoop();
                 }
         }
 
@@ -783,6 +780,20 @@ World.prototype.exportJSON = function()
         return jStr;
 }
 
+World.prototype.rebuildTree = function( obj )
+{
+        if (!obj)  return;
+
+        obj.buildBuffers();
+
+        if (obj.getChild()) {
+                 this.rebuildTree( obj.getChild () );
+    }
+
+        if (obj.getNext())
+                this.rebuildTree( obj.getNext() );
+}
+
 World.prototype.exportObjectsJSON = function( obj,  parentObj )
 {
         if (!obj)  return;
@@ -931,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)
@@ -950,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;