diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-25 18:32:14 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-25 18:32:14 -0400 |
| commit | 630c08b712a2ace833217428f1ef20bddc0b975d (patch) | |
| tree | 196f58ec99ace6e348148b6d5bc0408a11319fae /public/assets/javascripts/ui/editor/EditorSettings.js | |
| parent | a9bf197a6e8f91cc91d772238168d9be1beb3c4d (diff) | |
blueprint integration into project editor
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorSettings.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorSettings.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index 460863e..000852e 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -41,7 +41,12 @@ var EditorSettings = FormView.extend({ this.action = data.isNew ? this.createAction : this.updateAction this.parent.data = data - data.rooms && Rooms.deserialize(data.rooms, data.walls) + if (data.rooms) { + Rooms.deserialize(data.rooms, data.walls) + } + else if (data.shapes) { + Rooms.deserializeFromShapes(data.shapes, data.walls) + } if (data.startPosition) { scene.camera.move(data.startPosition) this.startPosition = data.startPosition |