diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-05 15:54:21 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-05 15:54:21 -0700 |
| commit | fe589170d3faa5ca681baca7b9a664e2d851cd6e (patch) | |
| tree | 88123dcda34a308d05473dc17707d42d5f7b6014 /indra/newview/llsettingsvo.cpp | |
| parent | fff2aecf7f96de9e53620887210487a48dd45580 (diff) | |
SL-10896
Fix deferred water soften prog lightnorm getting stomped with rotated lightnorm,
because it's a water shader and needs water atmo uniform values,
but it's a deferred lighting shader that needs not-so-rotated lightnorms.
Make sunlight_color not get auto-updated so we can get the correct value from mSunDiffuse.
Remove mix to preserve bumps as it was washing out shadows.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 10a0527fe2..6556380f28 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -719,7 +719,7 @@ LLSettingsSky::parammapping_t LLSettingsVOSky::getParameterMap() const param_map[SETTING_CLOUD_VARIANCE] = DefaultParam(LLShaderMgr::CLOUD_VARIANCE, sky_defaults[SETTING_CLOUD_VARIANCE]); param_map[SETTING_GLOW] = DefaultParam(LLShaderMgr::GLOW, sky_defaults[SETTING_GLOW]); param_map[SETTING_MAX_Y] = DefaultParam(LLShaderMgr::MAX_Y, sky_defaults[SETTING_MAX_Y]); - param_map[SETTING_SUNLIGHT_COLOR] = DefaultParam(LLShaderMgr::SUNLIGHT_COLOR, sky_defaults[SETTING_SUNLIGHT_COLOR]); + //param_map[SETTING_SUNLIGHT_COLOR] = DefaultParam(LLShaderMgr::SUNLIGHT_COLOR, sky_defaults[SETTING_SUNLIGHT_COLOR]); param_map[SETTING_MOON_BRIGHTNESS] = DefaultParam(LLShaderMgr::MOON_BRIGHTNESS, sky_defaults[SETTING_MOON_BRIGHTNESS]); param_map[SETTING_SKY_MOISTURE_LEVEL] = DefaultParam(LLShaderMgr::MOISTURE_LEVEL, sky_defaults[SETTING_SKY_MOISTURE_LEVEL]); param_map[SETTING_SKY_DROPLET_RADIUS] = DefaultParam(LLShaderMgr::DROPLET_RADIUS, sky_defaults[SETTING_SKY_DROPLET_RADIUS]); |