livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in graham_linden/viewer-eep-fixes (pull request #332) 

SL-10856
meow-7.2.2
Rider Linden 2019-04-03 22:42:40 +00:00
parent 8f1e75071e a5d4edaccc
commit 51cd9e7ddc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
View File

@ -66,8 +66,8 @@ void main()
outColor = applyWaterFogView(pos.xyz, outColor);
#endif
frag_data[0] = vec4(outColor.rgb, 1.0);
frag_data[1] = vec4(0.66,0.86,0.66,0.05f);
frag_data[0] = vec4(outColor.rgb, 0.0);
frag_data[1] = vec4(0.0,0.0,0.0,0.0);
vec3 nvn = normalize(vary_normal);
frag_data[2] = vec4(encode_normal(nvn.xyz), 0.0, 0.0);
}

2
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
View File

@ -168,8 +168,6 @@ void main()
col = fogged.rgb;
bloom = fogged.a;
#endif
//col.rgb = a;
}
frag_color.rgb = col.rgb;
frag_color.a = bloom;