From ae65d99dd9af6cf730e3fc20eea6f47540332d68 Mon Sep 17 00:00:00 2001 From: vyacheslavsproductengine Date: Wed, 3 Jun 2015 18:04:17 +0400 Subject: MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.) --- indra/newview/lldrawpoolbump.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lldrawpoolbump.cpp') 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); } -- cgit v1.2.3 From 5d70ea8d4f7a5029a75e36383c95f2fdd1e8db99 Mon Sep 17 00:00:00 2001 From: vyacheslavsproductengine Date: Wed, 3 Jun 2015 19:57:01 +0400 Subject: Backed out changeset: ebdaabeef422 --- indra/newview/lldrawpoolbump.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/lldrawpoolbump.cpp') diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 7b9fd5c6c6..33f7bc305c 100755 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -864,7 +864,6 @@ void LLDrawPoolBump::renderDeferred(S32 pass) { LLDrawInfo& params = **i; - gDeferredBumpProgram.setMinimumAlpha(params.mAlphaMaskCutoff); LLDrawPoolBump::bindBumpMap(params, bump_channel); pushBatch(params, mask, TRUE); } -- cgit v1.2.3 From 3f3bac5e913545bcf22e66460bbfec5cb9b655db Mon Sep 17 00:00:00 2001 From: vyacheslavsproductengine Date: Wed, 3 Jun 2015 20:00:53 +0400 Subject: MAINT-4446 FIXED R2 (Alpha masking does not work when ALM is enabled if the object has a legacy bump set.) --- indra/newview/lldrawpoolbump.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lldrawpoolbump.cpp') 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); } -- cgit v1.2.3