From a1945ecdbd457cb807d8d03f2e2cea9d564b2cbc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 18 May 2020 21:52:36 +0200 Subject: [PATCH] Correct "enabled" check for deferred rendering checkbox in phototools --- indra/newview/quickprefs.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp index c87f2016e4..0b9a7c091b 100644 --- a/indra/newview/quickprefs.cpp +++ b/indra/newview/quickprefs.cpp @@ -811,8 +811,11 @@ void FloaterQuickPrefs::refreshSettings() sky_spinner->setEnabled(TRUE); sky_default_button->setEnabled(TRUE); + BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump"); + BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders"); BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && - gSavedSettings.getBOOL("RenderObjectBump") && + bumpshiny && + shaders && gGLManager.mHasFramebufferObject && gSavedSettings.getBOOL("RenderAvatarVP") && (mCtrlWindLight->get()) ? TRUE : FALSE;