Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-26 22:15:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a crash in RenderableModelEntityItem::getModel

Browse source
This commit is contained in:
Seth Alves 2016-04-25 10:26:32 -07:00
parent 88ab52d340
commit 16bf59f8a6
1 changed files with 6 additions and 4 deletions

10
libraries/entities/src/EntityTree.cpp
View file

@ -1459,10 +1459,12 @@ void EntityTree::trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytes
void EntityTree::callLoader(EntityItemID entityID) {
// this is used to bounce from the networking thread to the main thread
EntityItemPointer entity = findEntityByEntityItemID(entityID);
if (entity) {
entity->loader();
}
this->withWriteLock([&] {
EntityItemPointer entity = findEntityByEntityItemID(entityID);
if (entity) {
entity->loader();
}
});
}
int EntityTree::getJointIndex(const QUuid& entityID, const QString& name) const {