aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing/world.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-30 10:27:54 -0700
committerJonathan Duran2012-03-30 10:27:54 -0700
commit7bcc6c6873778a19afb5b7f77e5b7e2e8deedd94 (patch)
treefbb26ddd8d8edceea991866de0114180cd0bdb26 /js/lib/drawing/world.js
parentaa9d13bb03f9fdc090bbf78c10ed8d5c79895019 (diff)
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
downloadninja-7bcc6c6873778a19afb5b7f77e5b7e2e8deedd94.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/lib/drawing/world.js')
-rwxr-xr-xjs/lib/drawing/world.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index fec6a478..5a054224 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -942,6 +942,7 @@ World.prototype.importObjectsJSON = function( jObj, parentGeomObj )
942World.prototype.importObjectJSON = function( jObj, parentGeomObj ) 942World.prototype.importObjectJSON = function( jObj, parentGeomObj )
943{ 943{
944 var type = jObj.type; 944 var type = jObj.type;
945 var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
945 946
946 var obj; 947 var obj;
947 switch (type) 948 switch (type)
@@ -961,6 +962,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
961 obj.importJSON( jObj ); 962 obj.importJSON( jObj );
962 break; 963 break;
963 964
965 case 6: //brush stroke
966 obj = new BrushStroke();
967 obj.importJSON(jObj);
968 break;
969
964 default: 970 default:
965 throw new Error( "Unrecognized object type: " + type ); 971 throw new Error( "Unrecognized object type: " + type );
966 break; 972 break;