Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 20:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

possible fix for crash when grabbing bubblewand

Browse source
This commit is contained in:
Seth Alves 2015-12-08 09:44:43 -08:00
parent 0bf276efa5
commit ec9f1e0754
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,10 +206,13 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
// All of parentID, parentJointIndex, position, rotation are needed to make sense of any of them. // All of parentID, parentJointIndex, position, rotation are needed to make sense of any of them.
// If any of these changed, pull any missing properties from the entity. // If any of these changed, pull any missing properties from the entity.
EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID); EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
if (entity && !scriptSideProperties.parentIDChanged()) { if (!entity) {
return;
}
if (!scriptSideProperties.parentIDChanged()) {
properties.setParentID(entity->getParentID()); properties.setParentID(entity->getParentID());
} }
if (entity && !scriptSideProperties.parentJointIndexChanged()) { if (!scriptSideProperties.parentJointIndexChanged()) {
properties.setParentJointIndex(entity->getParentJointIndex()); properties.setParentJointIndex(entity->getParentJointIndex());
} }
if (!scriptSideProperties.localPositionChanged() && !scriptSideProperties.positionChanged()) { if (!scriptSideProperties.localPositionChanged() && !scriptSideProperties.positionChanged()) {