Merge pull request #11789 from ctrlaltdavid/21599

Don't remove entities from list when try to delete locked entity
This commit is contained in:
Andrew Meadows 2017-11-17 11:26:00 -08:00 committed by GitHub
commit 6a784794c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1424,6 +1424,7 @@ function deleteSelectedEntities() {
for (var i = 0; i < newSortedSelection.length; i++) {
var entityID = newSortedSelection[i];
var initialProperties = SelectionManager.savedProperties[entityID];
if (!initialProperties.locked) {
var children = Entities.getChildrenIDs(entityID);
var childList = [];
recursiveDelete(children, childList, deletedIDs);
@ -1435,6 +1436,9 @@ function deleteSelectedEntities() {
deletedIDs.push(entityID);
Entities.deleteEntity(entityID);
}
}
if (savedProperties.length > 0) {
SelectionManager.clearSelections();
pushCommandForSelections([], savedProperties);
@ -1443,6 +1447,7 @@ function deleteSelectedEntities() {
ids: deletedIDs
}));
}
}
}
function toggleSelectedEntitiesLocked() {