History

Merge branch 'master' into ajt/new-anim-system

Anthony J. Thibault committed 11 years ago

Commit df28c7b2 parents 3716d56 762bed837 files · +1066 −249Browse files

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

Unified · Split

interface/src/Menu.cpp+1−0
@@ -317,6 +317,7 @@ Menu::Menu() { · 316 unmodified lines
317 0, // QML Qt::SHIFT | Qt::Key_A,317 0, // QML Qt::SHIFT | Qt::Key_A,
318 true);318 true);
319 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);319 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);
320 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Antialiasing);
320 321
321 MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight);322 MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight);
322 QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu);323 QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu);

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