From dff4e34e7bc96eb622c0d2b4733e0e85b7cb3878 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 19 Nov 2018 16:59:33 -0800
Subject: [PATCH] CR changes

---
 scripts/system/edit.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 85fd8c536d..077d50ddde 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2223,7 +2223,7 @@ var PropertiesTool = function (opts) {
     // are selected or if no entity is selected this will be `null`.
     var currentSelectedEntityID = null;
     var statusMonitor = null;
-    var nextPropertyUpdateDisabled = false;
+    var blockPropertyUpdates = false;
 
     that.setVisible = function (newVisible) {
         visible = newVisible;
@@ -2261,8 +2261,7 @@ var PropertiesTool = function (opts) {
     };
 
     function updateSelections(selectionUpdated) {
-        if (nextPropertyUpdateDisabled) {
-            nextPropertyUpdateDisabled = false;
+        if (blockPropertyUpdates) {
             return;
         }
 
@@ -2362,8 +2361,9 @@ var PropertiesTool = function (opts) {
                 }
             }
             pushCommandForSelections();
-            nextPropertyUpdateDisabled = data.blockUpdateCallback === true;
+            blockPropertyUpdates = data.blockUpdateCallback === true;
             selectionManager._update(false, this);
+            blockPropertyUpdates = false;
         } else if (data.type === 'saveUserData' || data.type === 'saveMaterialData') {
             //the event bridge and json parsing handle our avatar id string differently.
             var actualID = data.id.split('"')[1];