From 11d296a4777e4fe9ffba354ddbf2af67d2888437 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 10 Feb 2016 14:08:35 -0800 Subject: [PATCH] if we are told to clear the octree, disable physics until we have (re)loaded entities --- interface/src/Application.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index efc482a3b4..83f1d78dda 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3877,6 +3877,8 @@ void Application::clearDomainOctreeDetails() { qCDebug(interfaceapp) << "Clearing domain octree details..."; // reset the environment so that we don't erroneously end up with multiple + _physicsEnabled = false; + // reset our node to stats and node to jurisdiction maps... since these must be changing... _entityServerJurisdictions.withWriteLock([&] { _entityServerJurisdictions.clear();