Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 11 insertions, 1 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 154fb7f8..53cca029 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    NJUtils     = require("js/lib/NJUtils").NJUtils;
 
 exports.SelectionController = Montage.create(Component, {
 
@@ -111,6 +112,15 @@ exports.SelectionController = Montage.create(Component, {
             if(!this._isDocument) {
                 if(this.findSelectedElement(event.detail) !== -1) {
                     this.executeSelectElement();
+                    var element = event.detail;
+                     if (element) {
+                        if (element.elementModel) {
+                            if (element.elementModel.shapeModel) {
+                                if (element.elementModel.shapeModel.GLWorld)
+                                    element.elementModel.shapeModel.GLWorld.clearTree();
+                            }
+                        }
+                    }
                 }
             }
         }