diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-06-29 15:19:44 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-06-29 15:19:52 +0300 |
commit | 9feb0d5f2eb87cc5f19b00c8928514e44edc4dde (patch) | |
tree | 14d9dc038ac088bd14d5001a0d790f5be3c30bfd /source/blender/draw/engines | |
parent | bd6cc282d28f58766d84d78d4400d3020fe4cb10 (diff) |
Fix T74220 Mantaflow Color Mapping not ignoring alpha value
And also remove some sRGB hack.
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl index 0c2b7850f94..2920a504062 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl @@ -107,7 +107,6 @@ void volume_properties(vec3 ls_pos, out vec3 scattering, out float extinction) #ifdef USE_COBA float val = sample_volume_texture(densityTexture, co).r; vec4 tval = texture(transferTexture, val) * densityScale; - tval.rgb = pow(tval.rgb, vec3(2.2)); scattering = tval.rgb * 1500.0; extinction = max(1e-4, tval.a * 50.0); #else @@ -127,7 +126,7 @@ void volume_properties(vec3 ls_pos, out vec3 scattering, out float extinction) # ifdef VOLUME_SMOKE /* 800 is arbitrary and here to mimic old viewport. TODO make it a parameter */ - scattering += pow(emission.rgb, vec3(2.2)) * emission.a * 800.0; + scattering += emission.rgb * emission.a * 800.0; # endif #endif } |