summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsvo.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-26 16:46:38 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-26 16:46:38 +0100
commit6dc109a8d248540c6674b863e3e4655d079528d8 (patch)
tree50b2681907cde3560dadfc874cdc82170f583175 /indra/newview/llsettingsvo.cpp
parent6fb68454d5cb5fca175e1f0741fdfc03b08a9185 (diff)
Remove unnecessary coord sys transformation to fix moon positioning.
Avoid doing sky texture generation when using atmospherics shaders (which don't need that texture anyway).
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
-rw-r--r--indra/newview/llsettingsvo.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 44bb9fc6f5..646b317325 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -525,12 +525,7 @@ void LLSettingsVOSky::updateSettings()
F32 sun_dynamic_range = llmax(gSavedSettings.getF32("RenderSunDynamicRange"), 0.0001f);
mSceneLightStrength = 2.0f * (1.0f + sun_dynamic_range * dp);
- // Axis swaps convert from "normal" (+x right, +z up, +y at)
- // to CFR (+x at, +z up, +y right) coord sys
- LLVector3 sun_direction_cfr(sun_direction.mV[1], sun_direction.mV[0], sun_direction.mV[2]);
- LLVector3 moon_direction_cfr(moon_direction.mV[1], moon_direction.mV[0], moon_direction.mV[2]);
-
- gSky.setSunAndMoonDirectionsCFR(sun_direction_cfr, moon_direction_cfr);
+ gSky.setSunAndMoonDirectionsCFR(sun_direction, moon_direction);
gSky.setSunTextures(getSunTextureId(), getNextSunTextureId());
gSky.setMoonTextures(getMoonTextureId(), getNextMoonTextureId());
gSky.setCloudNoiseTextures(getCloudNoiseTextureId(), getNextCloudNoiseTextureId());