aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-30 11:04:47 -0700
committerNivesh Rajbhandari2012-03-30 11:04:47 -0700
commit80782d5d0721463f716f0a7241afd09a38543199 (patch)
tree2dfb0531f2498afcad5afe95f8e338d0f1d34161 /js/lib/drawing
parent5b4f6b1618cf571a6bce5a631f976a008e04a64e (diff)
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
downloadninja-80782d5d0721463f716f0a7241afd09a38543199.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFileIO
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/lib/drawing')
-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 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 )
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;