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

Merge pull request #15281 from kitely/copy-grandchild-entities

Browse source 
case 21980: Allow copying grandchild entities
This commit is contained in:
Thijs Wenker 2019-04-08 19:59:46 +02:00 committed by GitHub
commit 98e0164964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/edit.js
View file

@ -1630,7 +1630,7 @@ function recursiveDelete(entities, childrenList, deletedIDs, entityHostType) {
if (entityHostTypes[i].entityHostType !== entityHostType) {
if (wantDebug) {
console.log("Skipping deletion of entity " + entityID + " with conflicting entityHostType: " +
entityHostTypes[i].entityHostType);
entityHostTypes[i].entityHostType + ", expected: " + entityHostType);
}
continue;
}

8
scripts/system/libraries/entitySelectionTool.js
View file

@ -206,7 +206,7 @@ SelectionManager = (function() {
if (entityHostTypes[i].entityHostType !== entityHostType) {
if (wantDebug) {
console.log("Skipping addition of entity " + childID + " with conflicting entityHostType: " +
entityHostTypes[i].entityHostType);
entityHostTypes[i].entityHostType + ", expected: " + entityHostType);
}
continue;
}
@ -398,15 +398,15 @@ SelectionManager = (function() {
if (entityHostTypes[i].entityHostType !== entityHostType) {
if (wantDebug) {
console.warn("Skipping deletion of entity " + id + " with conflicting entityHostType: " +
entityHostTypes[i].entityHostType);
console.warn("Skipping addition of entity " + id + " with conflicting entityHostType: " +
entityHostTypes[i].entityHostType + ", expected: " + entityHostType);
}
continue;
}
if (!(id in entities)) {
entities[id] = Entities.getEntityProperties(id);
appendChildren(id, entities);
appendChildren(id, entities, entityHostType);
}
}
}