diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
| commit | 290406294891cba3e3f1496ff952d4b485d0fc49 (patch) | |
| tree | e02c02f130b4e00054028b400e7974252cde8495 /indra/newview/llsettingsvo.cpp | |
| parent | 67ce0e77d786b21c40e12b242e4646cfe6915e26 (diff) | |
| parent | 94cb1ba16c5b301779e437f73af9e06558f15760 (diff) | |
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 7c762170a7..707b602fc6 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -694,8 +694,8 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force) LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky(); - LLVector4 sunDiffuse = LLVector4(psky->getSunlightColor().mV); - LLVector4 moonDiffuse = LLVector4(psky->getMoonlightColor().mV); + LLVector4 sunDiffuse = LLVector4(LLVector3(psky->getSunlightColor().mV)); + LLVector4 moonDiffuse = LLVector4(LLVector3(psky->getMoonlightColor().mV)); shader->uniform4fv(LLShaderMgr::SUNLIGHT_COLOR, sunDiffuse); shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, moonDiffuse); |