Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 09:18:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't remove entities from list when try to delete locked entity

Browse source
This commit is contained in:
David Rowe 2017-11-10 10:50:07 +13:00
parent 40baca6ee1
commit ad661cb345
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
scripts/system/edit.js
View file

@ -1424,24 +1424,29 @@ function deleteSelectedEntities() {
for (var i = 0; i < newSortedSelection.length; i++) { for (var i = 0; i < newSortedSelection.length; i++) {
var entityID = newSortedSelection[i]; var entityID = newSortedSelection[i];
var initialProperties = SelectionManager.savedProperties[entityID]; var initialProperties = SelectionManager.savedProperties[entityID];
var children = Entities.getChildrenIDs(entityID); if (!initialProperties.locked) {
var childList = []; var children = Entities.getChildrenIDs(entityID);
recursiveDelete(children, childList, deletedIDs); var childList = [];
savedProperties.push({ recursiveDelete(children, childList, deletedIDs);
entityID: entityID, savedProperties.push({
properties: initialProperties, entityID: entityID,
children: childList properties: initialProperties,
}); children: childList
deletedIDs.push(entityID); });
Entities.deleteEntity(entityID); deletedIDs.push(entityID);
Entities.deleteEntity(entityID);
}
} }
SelectionManager.clearSelections();
pushCommandForSelections([], savedProperties);
entityListTool.webView.emitScriptEvent(JSON.stringify({ if (savedProperties.length > 0) {
type: "deleted", SelectionManager.clearSelections();
ids: deletedIDs pushCommandForSelections([], savedProperties);
}));
entityListTool.webView.emitScriptEvent(JSON.stringify({
type: "deleted",
ids: deletedIDs
}));
}
} }
} }