History

Merge branch 'menu-updates' of https://github.com/alexiamandeville/hifi into menu-updates

Alexia Mandeville committed 8 years ago

Commit 200d8622 parents 90e98f1 718c32f49 files · +1221 −719Browse files

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

Unified · Split

interface/src/Menu.cpp+9−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
4646 #include "InterfaceLogging.h"
4747 #include "LocationBookmarks.h"
4848 #include "DeferredLightingEffect.h"
49+#include "PickManager.h"
4950
5051 #include "AmbientOcclusionEffect.h"
5152 #include "RenderShadowTask.h"
@@ -747,8 +748,16 @@ Menu::Menu() { · 695 unmodified lines
747748 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraints, 0, false, qApp, SLOT(setShowBulletConstraints(bool)));
748749 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraintLimits, 0, false, qApp, SLOT(setShowBulletConstraintLimits(bool)));
749750
751+ // Developer > Picking >>>
752+ MenuWrapper* pickingOptionsMenu = developerMenu->addMenu("Picking");
753+ addCheckableActionToQMenuAndActionHash(pickingOptionsMenu, MenuOption::ForceCoarsePicking, 0, false,
754+ DependencyManager::get<PickManager>().data(), SLOT(setForceCoarsePicking(bool)));
755+
750756 // Developer > Crash >>>
751757 MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
758+
759+ // Developer > Crash > Display Crash Options
760+ addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);
752761
753762 // Developer > Crash > Display Crash Options
754763 addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);