diff options
author | hwc487 | 2012-03-22 15:47:11 -0700 |
---|---|---|
committer | hwc487 | 2012-03-22 15:47:11 -0700 |
commit | e927e4702d7dbd4a878f6979b3f56b46758f93de (patch) | |
tree | e6bb8951374a6504bd6c745ce7233da5cd4869dc /js/controllers/selection-controller.js | |
parent | 00cd98e49c959906d7c44bb6adcdef1f3d5148ae (diff) | |
parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
download | ninja-e927e4702d7dbd4a878f6979b3f56b46758f93de.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into Textures
Diffstat (limited to 'js/controllers/selection-controller.js')
-rwxr-xr-x | js/controllers/selection-controller.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 154fb7f8..f29b39e2 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -111,6 +111,15 @@ exports.SelectionController = Montage.create(Component, { | |||
111 | if(!this._isDocument) { | 111 | if(!this._isDocument) { |
112 | if(this.findSelectedElement(event.detail) !== -1) { | 112 | if(this.findSelectedElement(event.detail) !== -1) { |
113 | this.executeSelectElement(); | 113 | this.executeSelectElement(); |
114 | var element = event.detail; | ||
115 | if (element) { | ||
116 | if (element.elementModel) { | ||
117 | if (element.elementModel.shapeModel) { | ||
118 | if (element.elementModel.shapeModel.GLWorld) | ||
119 | element.elementModel.shapeModel.GLWorld.clearTree(); | ||
120 | } | ||
121 | } | ||
122 | } | ||
114 | } | 123 | } |
115 | } | 124 | } |
116 | } | 125 | } |