Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 2 insertions, 1 deletions

diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
index 96053490..0c4a9171 100644
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
@@ -215,7 +215,8 @@ exports.ThreeD = Montage.create(Component, {
             Object.defineBinding(this, "item", {
                     boundObject: this,
                     boundObjectPropertyPath: "application.ninja.selectedElements",
-                    boundValueMutator: this._getSelectedItem
+                    boundValueMutator: this._getSelectedItem,
+                    oneway: true
                 });
         }
     },