diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-06 15:44:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-06 15:44:44 -0500 |
| commit | 18e3985120d53acdf07d43dce79312b78629e57a (patch) | |
| tree | c4cf4cc69decbb3beeb910f8038d2d321e7f2d18 /indra/llprimitive/llmaterial.h | |
| parent | df6bb7ace2f2ca26f5fabf8305e190e7d0066cf1 (diff) | |
NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index b294288c64..b265732adc 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -44,7 +44,8 @@ public: DIFFUSE_ALPHA_MODE_NONE = 0, DIFFUSE_ALPHA_MODE_BLEND = 1, DIFFUSE_ALPHA_MODE_MASK = 2, - DIFFUSE_ALPHA_MODE_EMISSIVE = 3 + DIFFUSE_ALPHA_MODE_EMISSIVE = 3, + DIFFUSE_ALPHA_MODE_DEFAULT = 4, } eDiffuseAlphaMode; typedef enum @@ -100,7 +101,7 @@ public: bool operator == (const LLMaterial& rhs) const; bool operator != (const LLMaterial& rhs) const; - U32 getShaderMask(); + U32 getShaderMask(U32 alpha_mode = DIFFUSE_ALPHA_MODE_DEFAULT); protected: LLUUID mNormalID; |