Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Canvas-interaction

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 )
 {
         var type = jObj.type;
     var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
-
+    var SubPath = require("js/lib/geom/sub-path").SubPath;
         var obj;
         switch (type)
         {
@@ -888,6 +888,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
             obj.importJSON( jObj );
             break;
 
+        case 5:     //cubic bezier
+            obj = new SubPath();
+            obj.importJSON(jObj);
+            break;
+
         case 6:     //brush stroke
             obj = new BrushStroke();
             obj.importJSON(jObj);