diff options
author | Jose Antonio Marquez | 2012-04-26 11:07:09 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-26 11:07:09 -0700 |
commit | d193e087bf24b538b6d88ae501b4b6e9781f501b (patch) | |
tree | 9a735388752f575fddf72240803c385316ff5c43 /js/lib/drawing/world.js | |
parent | 7f5eb2105c2e5e0970072af88fa90baded7e55d6 (diff) | |
parent | bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff) | |
download | ninja-d193e087bf24b538b6d88ae501b4b6e9781f501b.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/lib/drawing/world.js')
-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 945c9883..1a391338 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -866,7 +866,7 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | |||
866 | { | 866 | { |
867 | var type = jObj.type; | 867 | var type = jObj.type; |
868 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; | 868 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; |
869 | 869 | var SubPath = require("js/lib/geom/sub-path").SubPath; | |
870 | var obj; | 870 | var obj; |
871 | switch (type) | 871 | switch (type) |
872 | { | 872 | { |
@@ -885,6 +885,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | |||
885 | obj.importJSON( jObj ); | 885 | obj.importJSON( jObj ); |
886 | break; | 886 | break; |
887 | 887 | ||
888 | case 5: //cubic bezier | ||
889 | obj = new SubPath(); | ||
890 | obj.importJSON(jObj); | ||
891 | break; | ||
892 | |||
888 | case 6: //brush stroke | 893 | case 6: //brush stroke |
889 | obj = new BrushStroke(); | 894 | obj = new BrushStroke(); |
890 | obj.importJSON(jObj); | 895 | obj.importJSON(jObj); |