diff options
| author | Guru <alexandrgproductengine@lindenlab.com> | 2023-02-27 08:28:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 08:28:30 +0100 |
| commit | 22b690bb5da880c1133a5c628f4d38436d6fa00e (patch) | |
| tree | 91c8f0d2e1751bab3d52f8b17c87f3a1558994a6 /indra/llprimitive/llmaterial.h | |
| parent | fe21f3fdf1e98eb2393449963f6bfd97b1885d44 (diff) | |
| parent | a6ea3fa741c90b4fe88550085f9a6b52d71447fd (diff) | |
Merge pull request #94 from secondlife/SL-18882
SL-18882: Show diffuse non-alpha textures opaque on editing
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index d58b7ee812..d92ef1dfba 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -126,7 +126,7 @@ public: bool operator == (const LLMaterial& rhs) const; bool operator != (const LLMaterial& rhs) const; - U32 getShaderMask(U32 alpha_mode = DIFFUSE_ALPHA_MODE_DEFAULT); + U32 getShaderMask(U32 alpha_mode, BOOL is_alpha); protected: LLUUID mNormalID; |