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/Menu.cpp (1 of 12 files). Show all

Unified · Split

@@ -725,7 +725,6 @@ Menu::Menu() { · 724 unmodified lines
725	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,	725	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,
726	0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));	726	0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));
727	}	727	}
728	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls, 0, false, qApp->getEntities().data(), SIGNAL(setRenderDebugHulls()));
729		728
730	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletWireframe, 0, false, qApp, SLOT(setShowBulletWireframe(bool)));	729	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletWireframe, 0, false, qApp, SLOT(setShowBulletWireframe(bool)));
731	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletAABBs, 0, false, qApp, SLOT(setShowBulletAABBs(bool)));	730	addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletAABBs, 0, false, qApp, SLOT(setShowBulletAABBs(bool)));