diff options
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index b3ac9ddb..9b0159d4 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -495,7 +495,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
495 | world = new World(el, true); | 495 | world = new World(el, true); |
496 | el.elementModel.shapeModel.GLWorld = world; | 496 | el.elementModel.shapeModel.GLWorld = world; |
497 | el.elementModel.shapeModel.useWebGl = true; | 497 | el.elementModel.shapeModel.useWebGl = true; |
498 | world.import(worldData); | 498 | world.import(worldData, true); |
499 | el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot(); | 499 | el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot(); |
500 | 500 | ||
501 | sm = Object.create(MaterialsModel.getMaterial("FlatMaterial")); | 501 | sm = Object.create(MaterialsModel.getMaterial("FlatMaterial")); |
@@ -531,7 +531,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
531 | world = new World(el, false); | 531 | world = new World(el, false); |
532 | el.elementModel.shapeModel.GLWorld = world; | 532 | el.elementModel.shapeModel.GLWorld = world; |
533 | el.elementModel.shapeModel.useWebGl = false; | 533 | el.elementModel.shapeModel.useWebGl = false; |
534 | world.import(worldData); | 534 | world.import(worldData, true); |
535 | el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot(); | 535 | el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot(); |
536 | el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null); | 536 | el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null); |
537 | el.elementModel.shapeModel.strokeMaterial = null; | 537 | el.elementModel.shapeModel.strokeMaterial = null; |