Merge pull request #4840 from jherico/menu

Only display new menu in VR mode
This commit is contained in:
Philip Rosedale 2015-05-13 08:15:04 -07:00
commit b658c26799

View file

@ -1366,12 +1366,12 @@ void Application::keyPressEvent(QKeyEvent* event) {
}
//#define VR_MENU_ONLY_IN_HMD
#define VR_MENU_ONLY_IN_HMD
void Application::keyReleaseEvent(QKeyEvent* event) {
if (event->key() == Qt::Key_Alt && _altPressed && _window->isActiveWindow()) {
#ifdef VR_MENU_ONLY_IN_HMD
if (OculusManager::isConnected()) {
if (isHMDMode()) {
#endif
VrMenu::toggle();
#ifdef VR_MENU_ONLY_IN_HMD