Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect graphics requirements for FBOs and Hardware Skinning in graphics preferences, properly.

Browse Source
This commit is contained in:
Lirusaito
2012-07-29 22:25:41 -04:00
parent b987c025db
commit 1b69994ffa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpaneldisplay.cpp
View File

@@ -576,20 +576,22 @@ void LLPanelDisplay::refreshEnabledState()
mSkyFactorText->setEnabled(wlatmos); mSkyFactorText->setEnabled(wlatmos);
// Avatar Mode and FBO // Avatar Mode and FBO
childSetEnabled("fbo", gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred);
if (render_deferred && wlatmos && shaders) if (render_deferred && wlatmos && shaders)
{ {
childSetEnabled("fbo", false);
childSetValue("fbo", true); childSetValue("fbo", true);
mCtrlAvatarVP->setEnabled(false); mCtrlAvatarVP->setEnabled(false);
mCtrlAvatarVP->setValue(true); gSavedSettings.setBOOL("RenderAvatarVP", true);
} }
else if (!shaders) else if (!shaders)
{ {
childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
mCtrlAvatarVP->setEnabled(false); mCtrlAvatarVP->setEnabled(false);
mCtrlAvatarVP->setValue(false); gSavedSettings.setBOOL("RenderAvatarVP", false);
} }
else else
{ {
childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
mCtrlAvatarVP->setEnabled(true); mCtrlAvatarVP->setEnabled(true);
} }