From 1f478bdf1392a9880c35fbfef1ea181319f7870a Mon Sep 17 00:00:00 2001 From: Patrick Manalich Date: Fri, 2 Jun 2017 10:44:58 -0700 Subject: [PATCH] Repair Application.cpp --- interface/src/Application.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dbf7b7a418..bdefbc6773 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1683,9 +1683,6 @@ Application::~Application() { _physicsEngine->setCharacterController(nullptr); - // shutdown render engine - _main3DScene = nullptr; - _renderEngine = nullptr; // the _shapeManager should have zero references _shapeManager.collectGarbage(); assert(_shapeManager.getNumShapes() == 0); @@ -4497,17 +4494,7 @@ void Application::update(float deltaTime) { getEntities()->getTree()->withWriteLock([&] { PerformanceTimer perfTimer("handleOutgoingChanges"); - const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates(); - _entitySimulation->handleDeactivatedMotionStates(deactivations); - getEntities()->getTree()->withWriteLock([&] { - PerformanceTimer perfTimer("handleOutgoingChanges"); - - - const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates(); - _entitySimulation->handleChangedMotionStates(outgoingChanges); - avatarManager->handleChangedMotionStates(outgoingChanges); - }); const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates(); _entitySimulation->handleChangedMotionStates(outgoingChanges); avatarManager->handleChangedMotionStates(outgoingChanges);