History

Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly

Remove functionality for rendering collision models directly in the Model class

John Conklin II committed 8 years ago

Commit 2483c452 parents 0936313 79fd3cb12 files · +31 −243Browse files

Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all

Unified · Split

interface/src/Application.cpp+0−3
@@ -2241,9 +2241,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 2240 unmodified lines
2241 DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([&](unsigned int rayPickID, bool value) {2241 DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([&](unsigned int rayPickID, bool value) {
2242 DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value);2242 DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value);
2243 });2243 });
2244 EntityTreeRenderer::setRenderDebugHullsOperator([] {
2245 return Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls);
2246 });
2247 2244
2248 // Preload Tablet sounds2245 // Preload Tablet sounds
2249 DependencyManager::get<TabletScriptingInterface>()->preloadSounds();2246 DependencyManager::get<TabletScriptingInterface>()->preloadSounds();