diff options
| author | Petr Mikheev <ptmikheev@gmail.com> | 2022-01-03 21:41:27 +0000 |
|---|---|---|
| committer | Petr Mikheev <ptmikheev@gmail.com> | 2022-01-03 21:41:27 +0000 |
| commit | d1252090a4fbc8ce67d3071d8adf46d1977fe735 (patch) | |
| tree | c2b0047d1b881aed829ef3dfb619b27c426a7e42 | |
| parent | f91bd8d9eb053e00d2856f31746e69e77ef0a9d8 (diff) | |
| parent | d5cba38f4bb7f19a61347e0883c561cfaaeb46b2 (diff) | |
Merge branch 'blendtec_tures' into 'master'
Shader-based object texture blending
See merge request OpenMW/openmw!977
| -rw-r--r-- | files/shaders/objects_fragment.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl index 99ed44919b..6e8d929569 100644 --- a/files/shaders/objects_fragment.glsl +++ b/files/shaders/objects_fragment.glsl @@ -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 |