diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:46:16 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:46:16 +0100 |
| commit | a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 (patch) | |
| tree | 3ea09c4043c27998ac26181d80c4d41f8ef87f35 /indra/newview/llsettingsvo.cpp | |
| parent | 507c4921826e73635f6ae31087ab0e6cd1280f43 (diff) | |
Fix water fog consolidation in underwater shaders.
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 5991c42c97..b5fb889669 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -520,6 +520,8 @@ void LLSettingsVOSky::updateSettings() LLVector3 sun_direction_cfr(sun_direction.mV[0], -sun_direction.mV[1], sun_direction.mV[2]); LLVector3 moon_direction_cfr(moon_direction.mV[0], -moon_direction.mV[1], moon_direction.mV[2]); gSky.setSunAndMoonDirectionsCFR(sun_direction_cfr, moon_direction_cfr); + gSky.setSunTextures(getSunTextureId(), getNextSunTextureId()); + gSky.setMoonTextures(getMoonTextureId(), getNextMoonTextureId()); } void LLSettingsVOSky::applySpecial(void *ptarget) |