From c1385a9c354003773b79b58c71925fc0cf4b41fa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 6 Nov 2014 17:41:55 -0800 Subject: [PATCH] fix random crash on checkEnterLeaveEntities --- interface/src/entities/EntityTreeRenderer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/entities/EntityTreeRenderer.cpp b/interface/src/entities/EntityTreeRenderer.cpp index e447c703fb..46406e9f5e 100644 --- a/interface/src/entities/EntityTreeRenderer.cpp +++ b/interface/src/entities/EntityTreeRenderer.cpp @@ -196,6 +196,7 @@ void EntityTreeRenderer::update() { void EntityTreeRenderer::checkEnterLeaveEntities() { if (_tree) { + _tree->lockForRead(); glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition() / (float) TREE_SCALE; if (avatarPosition != _lastAvatarPosition) { @@ -240,6 +241,7 @@ void EntityTreeRenderer::checkEnterLeaveEntities() { _currentEntitiesInside = entitiesContainingAvatar; _lastAvatarPosition = avatarPosition; } + _tree->unlock(); } }