From aabf27955b8fcaded2e83c7b993a12f6a4781c96 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 16 Nov 2019 10:12:08 +1300 Subject: [PATCH] Fix camera view cycling getting stuck in non-existent fullscreen mirror --- interface/src/Application.cpp | 9 ++------- interface/src/Menu.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 221ab211f4..4d9ca91441 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5821,12 +5821,7 @@ void Application::centerUI() { void Application::cycleCamera() { auto menu = Menu::getInstance(); - if (menu->isOptionChecked(MenuOption::FullscreenMirror)) { - - menu->setIsOptionChecked(MenuOption::FullscreenMirror, false); - menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true); - - } else if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) { + if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) { menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false); menu->setIsOptionChecked(MenuOption::LookAtCamera, true); @@ -5839,7 +5834,7 @@ void Application::cycleCamera() { } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) { menu->setIsOptionChecked(MenuOption::SelfieCamera, false); - menu->setIsOptionChecked(MenuOption::FullscreenMirror, true); + menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true); } cameraMenuChanged(); // handle the menu change diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 3d3c8f9d35..cd751e444a 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -118,7 +118,6 @@ namespace MenuOption { const QString FixGaze = "Fix Gaze (no saccade)"; const QString Forward = "Forward"; const QString FrameTimer = "Show Timer"; - const QString FullscreenMirror = "Mirror"; const QString Help = "Help..."; const QString HomeLocation = "Home "; const QString IncreaseAvatarSize = "Increase Avatar Size";