summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-03-28 12:15:32 -0500
committerDave Parks <davep@lindenlab.com>2013-03-28 12:15:32 -0500
commit5121dd1a533b1d589cf259e96fa6d0ba22b383ea (patch)
tree2a8e471f0c3b917bace1bbb14d57e43fce2eaddb /indra/newview/app_settings/shaders/class1
parent74b5bfb98f0496a8e1519c4732bb5942e6fcc78a (diff)
NORSPEC-62 Fix for fullbright checkbox not working with materials
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 5392466b25..fdaad550f7 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -26,7 +26,7 @@
#define DIFFUSE_ALPHA_MODE_IGNORE 0
#define DIFFUSE_ALPHA_MODE_BLEND 1
#define DIFFUSE_ALPHA_MODE_MASK 2
-#define DIFFUSE_ALPHA_MODE_GLOW 3
+#define DIFFUSE_ALPHA_MODE_EMISSIVE 3
#ifdef DEFINE_GL_FRAGCOLOR
@@ -97,7 +97,7 @@ void main()
vec4 final_color = col;
-#if DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_GLOW
+#if DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_EMISSIVE
final_color.a = 0;
#endif