Skip to content

Commit 6128a7d

Browse files
authored
Make sure CAS controls are not active with vintage mode. (#3176)
Also make extra sure vintage mode is enabled when GL3 is detected.
1 parent fd0389c commit 6128a7d

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

indra/newview/llfeaturemanager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,9 @@ void LLFeatureManager::applyBaseMasks()
717717
// make sure to disable background context activity in GL3 mode
718718
LLImageGLThread::sEnabledMedia = false;
719719
LLImageGLThread::sEnabledTextures = false;
720+
721+
// Make extra sure that vintage mode also gets enabled.
722+
gSavedSettings.setBOOL("RenderVintageMode", true);
720723
}
721724

722725
// now mask by gpu string

indra/newview/llfloaterpreferencesgraphicsadvanced.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
271271
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
272272
LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail");
273273
LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText");
274+
LLSliderCtrl* cas_slider = getChild<LLSliderCtrl>("RenderSharpness");
274275

275276
// disabled windlight
276277
if (!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))
@@ -330,6 +331,7 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
330331
tonemapLabel->setEnabled(!is_vintage);
331332
tonemapMix->setEnabled(!is_vintage);
332333
exposureSlider->setEnabled(!is_vintage);
334+
cas_slider->setEnabled(!is_vintage);
333335
}
334336

335337
void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()

0 commit comments

Comments
 (0)