diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-28 12:16:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-28 12:16:16 -0500 |
| commit | 0f8976388ba0745c206d321d24c868b59f526119 (patch) | |
| tree | 3ea032e46e560137c7a06d9597d846bc2bd62a2a /indra/newview/app_settings/shaders | |
| parent | 48f433212f0b3f6a215156b3b26d0f43863727cd (diff) | |
| parent | 5121dd1a533b1d589cf259e96fa6d0ba22b383ea (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 4 |
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 |