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

Fix for Issue #1517

Browse source 
Fix for Issue #1517
Locked entities were simply ignored and it was still processing their children.
Now it's no more possible to duplicate if the selection and their children contains a locked entities.
It was also unable to add the new parent if the duplicated child entity was locked. Which was causing some other issues.
This commit is contained in:
Alezia Kurdis 2021-12-08 23:01:21 -05:00 committed by GitHub
parent d05227f177
commit 92f7997603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/create/entitySelectionTool/entitySelectionTool.js
View file

@ -343,6 +343,19 @@ SelectionManager = (function() {
}
var duplicateInterrupted = false;
for (var j = 0; j < entitiesToDuplicate.length; j++) {
var lockedEntities = Entities.getEntityProperties(entitiesToDuplicate[j], 'locked');
if (lockedEntities.locked) {
duplicateInterrupted = true;
break;
}
}
if (duplicateInterrupted) {
audioFeedback.rejection();
Window.notifyEditError("At least one of the selected entities or one of their children are locked.");
return [];
}
// duplicate entities from above and store their original to new entity mappings and children needing re-parenting
for (var i = 0; i < entitiesToDuplicate.length; i++) {
var originalEntityID = entitiesToDuplicate[i];
@ -389,8 +402,6 @@ SelectionManager = (function() {
duplicatedChildrenWithOldParents[newEntityID] = properties.parentID;
}
originalEntityToNewEntityID[originalEntityID] = newEntityID;
} else {
duplicateInterrupted = true;
}
}
@ -409,11 +420,7 @@ SelectionManager = (function() {
}
});
if (duplicateInterrupted) {
audioFeedback.rejection();
} else {
audioFeedback.confirmation();
}
audioFeedback.confirmation();
return duplicatedEntityIDs;
};