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

2019-07-04 12:39:47 -04:00
parent b8cfb5c8be d9392d5c39
commit 3a678f5a9b
12 changed files with 165 additions and 65 deletions
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -700,7 +700,7 @@ void main()

 	col.rgb += light.rgb;

-	glare = min(glare, 1.0) * diffcol.a;
+	glare = min(glare, 1.0)/* * diffcol.a*/;
 	float al = max(diffcol.a,glare)*vertex_color.a;

 	//convert to gamma space for display on screen