Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-12 02:00:53 +01:00
parent 00b57dd40e 203ae9dfa3
commit 6b5875c008
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
View File

@@ -534,8 +534,6 @@ void main()
#endif #endif
#ifdef FOR_IMPOSTOR #ifdef FOR_IMPOSTOR
vec4 color;
color.rgb = diff.rgb;
#ifdef USE_VERTEX_COLOR #ifdef USE_VERTEX_COLOR
float final_alpha = diff.a * vertex_color.a; float final_alpha = diff.a * vertex_color.a;
@@ -550,6 +548,7 @@ void main()
{ {
discard; discard;
} }
vec4 color = vec4(diff.rgb,final_alpha);
#else #else
#ifdef USE_VERTEX_COLOR #ifdef USE_VERTEX_COLOR
@@ -578,10 +577,7 @@ void main()
final_da = min(final_da, 1.0f); final_da = min(final_da, 1.0f);
final_da = pow(final_da, 1.0/1.3); final_da = pow(final_da, 1.0/1.3);
vec4 color = vec4(0,0,0,0); vec4 color = vec4(getAmblitColor(),final_alpha);
color.rgb = atmosAmbient(color.rgb);
color.a = final_alpha;
float ambient = abs(da); float ambient = abs(da);
ambient *= 0.5; ambient *= 0.5;