diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8fc7ef81c7..0168430f9f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -664,7 +664,7 @@ void Application::paintGL() { _myCamera.update(1.0f / _fps); } - if (Menu::getInstance()->getShadowsEnabled()) { + if (getShadowsEnabled()) { updateShadowMap(); } @@ -2956,8 +2956,10 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom } } -bool Application::getShadowsEnabled() { - return Menu::getInstance()->getShadowsEnabled(); +bool Application::getShadowsEnabled() { + Menu* menubar = Menu::getInstance(); + return menubar->isOptionChecked(MenuOption::SimpleShadows) || + menubar->isOptionChecked(MenuOption::CascadedShadows); } bool Application::getCascadeShadowsEnabled() { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index d627627000..34904542a0 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -1090,10 +1090,6 @@ void Menu::showEditEntitiesHelp() { InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH); } -bool Menu::getShadowsEnabled() const { - return isOptionChecked(MenuOption::SimpleShadows) || isOptionChecked(MenuOption::CascadedShadows); -} - void Menu::bumpSettings() { Application::getInstance()->bumpSettings(); } diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 6b91f98f6d..98445f31a6 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -136,8 +136,6 @@ public: const QString& getScriptsLocation() const { return _scriptsLocation; } void setScriptsLocation(const QString& scriptsLocation); - bool getShadowsEnabled() const; - #if defined(Q_OS_MAC) || defined(Q_OS_WIN) SpeechRecognizer* getSpeechRecognizer() { return &_speechRecognizer; } #endif