aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing
diff options
context:
space:
mode:
authorhwc4872012-04-25 11:06:12 -0700
committerhwc4872012-04-25 11:06:12 -0700
commit1304d00cec00f86442981a276817416ca37086b3 (patch)
treec46ae661f06cad048e6fbee073ba63160f424728 /js/lib/drawing
parentcec076988d3ff6547b7c9d74ebc80530ffcea67b (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-1304d00cec00f86442981a276817416ca37086b3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Canvas-interaction
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-xjs/lib/drawing/world.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 8ad4c6f5..7ee9ee00 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -869,7 +869,7 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
869{ 869{
870 var type = jObj.type; 870 var type = jObj.type;
871 var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; 871 var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
872 872 var SubPath = require("js/lib/geom/sub-path").SubPath;
873 var obj; 873 var obj;
874 switch (type) 874 switch (type)
875 { 875 {
@@ -888,6 +888,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
888 obj.importJSON( jObj ); 888 obj.importJSON( jObj );
889 break; 889 break;
890 890
891 case 5: //cubic bezier
892 obj = new SubPath();
893 obj.importJSON(jObj);
894 break;
895
891 case 6: //brush stroke 896 case 6: //brush stroke
892 obj = new BrushStroke(); 897 obj = new BrushStroke();
893 obj.importJSON(jObj); 898 obj.importJSON(jObj);