Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR changes

Browse source
This commit is contained in:
David Back 2018-11-19 16:59:33 -08:00
parent 249ebb2389
commit dff4e34e7b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/edit.js
View file

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