History

Merge pull request #4840 from jherico/menu

Only display new menu in VR mode

Philip Rosedale committed 11 years ago

Commit b658c262 parents 349886c f42e0c61 file · +2 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1366,12 +1366,12 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1365 unmodified lines
1366}1366}
1367 1367
1368 1368
1369//#define VR_MENU_ONLY_IN_HMD1369#define VR_MENU_ONLY_IN_HMD
1370 1370
1371void Application::keyReleaseEvent(QKeyEvent* event) {1371void Application::keyReleaseEvent(QKeyEvent* event) {
1372 if (event->key() == Qt::Key_Alt && _altPressed && _window->isActiveWindow()) {1372 if (event->key() == Qt::Key_Alt && _altPressed && _window->isActiveWindow()) {
1373#ifdef VR_MENU_ONLY_IN_HMD1373#ifdef VR_MENU_ONLY_IN_HMD
1374 if (OculusManager::isConnected()) {1374 if (isHMDMode()) {
1375#endif1375#endif
1376 VrMenu::toggle();1376 VrMenu::toggle();
1377#ifdef VR_MENU_ONLY_IN_HMD1377#ifdef VR_MENU_ONLY_IN_HMD