History

force coarse picking, sort avatars

SamGondelman committed 8 years ago

Commit c474f381 parent 5c0b12a11 files · +178 −108Browse files

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

Unified · Split

interface/src/Menu.cpp+6−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
46#include "InterfaceLogging.h"46#include "InterfaceLogging.h"
47#include "LocationBookmarks.h"47#include "LocationBookmarks.h"
48#include "DeferredLightingEffect.h"48#include "DeferredLightingEffect.h"
49#include "PickManager.h"
49 50
50#include "AmbientOcclusionEffect.h"51#include "AmbientOcclusionEffect.h"
51#include "RenderShadowTask.h"52#include "RenderShadowTask.h"
@@ -688,6 +689,11 @@ Menu::Menu() { · 636 unmodified lines
688 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraints, 0, false, qApp, SLOT(setShowBulletConstraints(bool)));689 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraints, 0, false, qApp, SLOT(setShowBulletConstraints(bool)));
689 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraintLimits, 0, false, qApp, SLOT(setShowBulletConstraintLimits(bool)));690 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletConstraintLimits, 0, false, qApp, SLOT(setShowBulletConstraintLimits(bool)));
690 691
692 // Developer > Picking >>>
693 MenuWrapper* pickingOptionsMenu = developerMenu->addMenu("Picking");
694 addCheckableActionToQMenuAndActionHash(pickingOptionsMenu, MenuOption::ForceCoarsePicking, 0, false,
695 DependencyManager::get<PickManager>().data(), SLOT(setForceCoarsePicking(bool)));
696
691 // Developer > Display Crash Options697 // Developer > Display Crash Options
692 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);698 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);
693 // Developer > Crash >>>699 // Developer > Crash >>>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t