diff options
author | hwc487 | 2012-04-26 13:04:25 -0700 |
---|---|---|
committer | hwc487 | 2012-04-26 13:04:25 -0700 |
commit | 37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch) | |
tree | c8260f151270c6bdbe08869ebaeb837777c28d1b /js/lib/drawing | |
parent | f13d0f45f6b449764898e99db309c43b51a33476 (diff) | |
parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
download | ninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-x | js/lib/drawing/world.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index eb06e59d..50fa735a 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -985,7 +985,7 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | |||
985 | { | 985 | { |
986 | var type = jObj.type; | 986 | var type = jObj.type; |
987 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; | 987 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; |
988 | 988 | var SubPath = require("js/lib/geom/sub-path").SubPath; | |
989 | var obj; | 989 | var obj; |
990 | switch (type) | 990 | switch (type) |
991 | { | 991 | { |
@@ -1004,6 +1004,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | |||
1004 | obj.importJSON( jObj ); | 1004 | obj.importJSON( jObj ); |
1005 | break; | 1005 | break; |
1006 | 1006 | ||
1007 | case 5: //cubic bezier | ||
1008 | obj = new SubPath(); | ||
1009 | obj.importJSON(jObj); | ||
1010 | break; | ||
1011 | |||
1007 | case 6: //brush stroke | 1012 | case 6: //brush stroke |
1008 | obj = new BrushStroke(); | 1013 | obj = new BrushStroke(); |
1009 | obj.importJSON(jObj); | 1014 | obj.importJSON(jObj); |