Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-03 16:38:52 +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

5
scripts/system/edit.js
View file

@ -1424,6 +1424,7 @@ 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];
if (!initialProperties.locked) {
var children = Entities.getChildrenIDs(entityID); var children = Entities.getChildrenIDs(entityID);
var childList = []; var childList = [];
recursiveDelete(children, childList, deletedIDs); recursiveDelete(children, childList, deletedIDs);
@ -1435,6 +1436,9 @@ function deleteSelectedEntities() {
deletedIDs.push(entityID); deletedIDs.push(entityID);
Entities.deleteEntity(entityID); Entities.deleteEntity(entityID);
} }
}
if (savedProperties.length > 0) {
SelectionManager.clearSelections(); SelectionManager.clearSelections();
pushCommandForSelections([], savedProperties); pushCommandForSelections([], savedProperties);
@ -1444,6 +1448,7 @@ function deleteSelectedEntities() {
})); }));
} }
} }
}
function toggleSelectedEntitiesLocked() { function toggleSelectedEntitiesLocked() {
if (SelectionManager.hasSelection()) { if (SelectionManager.hasSelection()) {