diff options
author | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
commit | 90c26759ef5fe1f35bcda82f444e647d07c28fc6 (patch) | |
tree | 5f0d669d275be58fa7543cb1a826b3036c031c13 /indra/newview/lldrawpoolbump.cpp | |
parent | 4d81570d62bc9d746565083ef18fdc16c198a5dc (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rwxr-xr-x | indra/newview/lldrawpoolbump.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 33f7bc305c..7b9fd5c6c6 100755 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -864,6 +864,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass) { LLDrawInfo& params = **i; + gDeferredBumpProgram.setMinimumAlpha(params.mAlphaMaskCutoff); LLDrawPoolBump::bindBumpMap(params, bump_channel); pushBatch(params, mask, TRUE); } |