From cdeaaf2ca98d41f8c90d0462c7d80967e2f897f4 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 8 Dec 2014 15:06:34 -0800 Subject: [PATCH] fix deadlock in enter/leave events --- interface/src/entities/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/entities/EntityTreeRenderer.cpp b/interface/src/entities/EntityTreeRenderer.cpp index b13cede725..dd9a0b6a4f 100644 --- a/interface/src/entities/EntityTreeRenderer.cpp +++ b/interface/src/entities/EntityTreeRenderer.cpp @@ -233,7 +233,7 @@ void EntityTreeRenderer::update() { void EntityTreeRenderer::checkEnterLeaveEntities() { if (_tree) { - _tree->lockForRead(); + _tree->lockForWrite(); // so that our scripts can do edits if they want glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition() / (float) TREE_SCALE; if (avatarPosition != _lastAvatarPosition) {