diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
| commit | 4cb5d10a3fe746ce5eb41da355ebceaebc460f26 (patch) | |
| tree | ea062b13c8e53ca8d040d6377d0e40d28070c654 /indra/llprimitive/llmaterial.h | |
| parent | 272da688f75880f73e227ae62bad1c5a9b28b288 (diff) | |
| parent | 7199ce45142f47003ba04381a76c1a4c7545f127 (diff) | |
Merged in euclid-15299 (pull request #580)
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index 1207917568..d58b7ee812 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -115,17 +115,8 @@ public: void setSpecularLightExponent(U8 exponent); U8 getEnvironmentIntensity() const; void setEnvironmentIntensity(U8 intensity); - - // getDiffuseAlphaModeRender takes into account if image supports alpha - // and returns value apropriate for render - // getDiffuseAlphaMode() returns value as is - U8 getDiffuseAlphaModeRender() const; U8 getDiffuseAlphaMode() const; void setDiffuseAlphaMode(U8 alpha_mode); - U32 getDiffuseFormatPrimary() const; - void setDiffuseFormatPrimary(U32 format_primary); - bool getIsDiffuseBaked() const; - void setDiffuseBaked(bool baked); U8 getAlphaMaskCutoff() const; void setAlphaMaskCutoff(U8 cutoff); @@ -156,8 +147,6 @@ protected: U8 mSpecularLightExponent; U8 mEnvironmentIntensity; U8 mDiffuseAlphaMode; - U32 mDiffuseFormatPrimary; // value from texture, LLGLenum, is not included in fromLLSD/asLLSD - bool mDiffuseBaked; // is not included in fromLLSD/asLLSD U8 mAlphaMaskCutoff; }; |