diff options
author | Valerio Virgillito | 2012-04-24 15:38:05 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-24 15:38:05 -0700 |
commit | d0893407d35f4e05bbe2fd41c2b70151984fe481 (patch) | |
tree | 33643dfc1daabb0604b04b78a89003d562045c9d /js/lib/drawing | |
parent | 4b5cc9cf1f01552f61c08b9299b6e99366432e03 (diff) | |
parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
download | ninja-d0893407d35f4e05bbe2fd41c2b70151984fe481.tar.gz |
Merge branch 'refs/heads/master' into stage-document-architecture
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 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); |