diff options
author | Graham Linden <graham@lindenlab.com> | 2019-02-06 16:42:23 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-02-06 16:42:23 -0800 |
commit | 8890c3238ab4ae8bbf1bc123284f9c6d4db4f9d6 (patch) | |
tree | 6d250b8114eb4d39a7c5810813a06d730665372b /indra/llrender/llrender.h | |
parent | f8171a909cb2a18fcca47f6a0317919ece802aef (diff) |
SL-10478
Fix side-effects of having both sun and moon as potential directional light contributors.
We pass an int to the shader indicating which to prefer instead of making per-pixel decisions
and pass the moonlight color/di independently.
Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r-- | indra/llrender/llrender.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index a79db80ebe..012a8da4ce 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -229,6 +229,7 @@ public: void enable(); void disable(); void setDiffuse(const LLColor4& diffuse); + void setDiffuseB(const LLColor4& diffuse); void setAmbient(const LLColor4& ambient); void setSpecular(const LLColor4& specular); void setPosition(const LLVector4& position); @@ -245,6 +246,7 @@ protected: S32 mIndex; bool mEnabled; LLColor4 mDiffuse; + LLColor4 mDiffuseB; LLColor4 mAmbient; LLColor4 mSpecular; LLVector4 mPosition; |