Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1336,11 +1336,11 @@ bool EntityScriptingInterface::isChildOfParent(QUuid childID, QUuid parentID) { · 1335 unmodified lines | ||
| 1336 | 1336 | parent->forEachDescendant([&](SpatiallyNestablePointer descendant) { |
| 1337 | 1337 | if(descendant->getID() == childID) { |
| 1338 | 1338 | isChild = true; |
| 1339 | − return; | |
| 1339 | + return; | |
| 1340 | 1340 | } |
| 1341 | 1341 | }); |
| 1342 | 1342 | }); |
| 1343 | − | |
| 1343 | + | |
| 1344 | 1344 | return isChild; |
| 1345 | 1345 | } |
| 1346 | 1346 | |
| @@ -1364,7 +1364,8 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDsOfJoint(const QUuid& pare · 17 unmodified lines | ||
| 1364 | 1364 | return; |
| 1365 | 1365 | } |
| 1366 | 1366 | parent->forEachChild([&](SpatiallyNestablePointer child) { |
| 1367 | − if (child->getParentJointIndex() == jointIndex) { | |
| 1367 | + if (child->getParentJointIndex() == jointIndex && | |
| 1368 | + child->getNestableType() != NestableType::Overlay) { | |
| 1368 | 1369 | result.push_back(child->getID()); |
| 1369 | 1370 | } |
| 1370 | 1371 | }); |