History

Merge branch 'master' into 20639

David Rowe committed 11 years ago

Commit ed259e62 parents e5d2a78 bc9411446 files · +4419 −644Browse files

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

Unified · Split

interface/src/Menu.cpp+2−2
@@ -330,7 +330,7 @@ Menu::Menu() { · 329 unmodified lines
330330 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere,
331331 0, // QML Qt::SHIFT | Qt::Key_A,
332332 true);
333− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion);
333+ addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);
334334
335335 MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight);
336336 QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu);
@@ -368,7 +368,7 @@ Menu::Menu() { · 31 unmodified lines
368368 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::RenderTargetFramerateVSyncOn, 0, true,
369369 qApp, SLOT(setVSyncEnabled()));
370370 #endif
371− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, false,
371+ addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true,
372372 qApp, SLOT(setThrottleFPSEnabled()));
373373 }
374374