Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12919 from kitely/fix-import-entities-distance

Browse source 
Fixed crash when importing entities from JSON multiple times
This commit is contained in:
John Conklin II 2018-04-18 11:52:46 -07:00 committed by GitHub
commit db99d12736
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,11 @@ void EntityTree::eraseAllOctreeElements(bool createNewRoot) {
resetClientEditStats(); resetClientEditStats();
clearDeletedEntities(); clearDeletedEntities();
{
QWriteLocker locker(&_needsParentFixupLock);
_needsParentFixup.clear();
}
} }
void EntityTree::readBitstreamToTree(const unsigned char* bitstream, void EntityTree::readBitstreamToTree(const unsigned char* bitstream,