mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-19 19:10:12 +00:00
Merge branch 'blendtec_tures' into 'master'
Shader-based object texture blending See merge request OpenMW/openmw!977
This commit is contained in:
commit
d1252090a4
1 changed files with 1 additions and 1 deletions
|
@ -146,7 +146,7 @@ void main()
|
|||
|
||||
#if @decalMap
|
||||
vec4 decalTex = texture2D(decalMap, decalMapUV);
|
||||
gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
|
||||
gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a * diffuseColor.a);
|
||||
#endif
|
||||
|
||||
#if @envMap
|
||||
|
|
Loading…
Reference in a new issue