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

don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint

Browse source
This commit is contained in:
Seth Alves 2017-01-15 11:27:29 -08:00
parent 7ab3e60f36
commit 3b4f5e3023
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1336,11 +1336,11 @@ bool EntityScriptingInterface::isChildOfParent(QUuid childID, QUuid parentID) {
parent->forEachDescendant([&](SpatiallyNestablePointer descendant) { parent->forEachDescendant([&](SpatiallyNestablePointer descendant) {
if(descendant->getID() == childID) { if(descendant->getID() == childID) {
isChild = true; isChild = true;
return; return;
} }
}); });
}); });
return isChild; return isChild;
} }
@ -1364,7 +1364,8 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDsOfJoint(const QUuid& pare
return; return;
} }
parent->forEachChild([&](SpatiallyNestablePointer child) { parent->forEachChild([&](SpatiallyNestablePointer child) {
if (child->getParentJointIndex() == jointIndex) { if (child->getParentJointIndex() == jointIndex &&
child->getNestableType() != NestableType::Overlay) {
result.push_back(child->getID()); result.push_back(child->getID());
} }
}); });