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/gpu/intern | |
parent | bd6cc282d28f58766d84d78d4400d3020fe4cb10 (diff) |
Fix T74220 Mantaflow Color Mapping not ignoring alpha value
And also remove some sRGB hack.
Diffstat (limited to 'source/blender/gpu/intern')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw_smoke.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw_smoke.c b/source/blender/gpu/intern/gpu_draw_smoke.c index 80c59ed47c9..67947df0ff7 100644 --- a/source/blender/gpu/intern/gpu_draw_smoke.c +++ b/source/blender/gpu/intern/gpu_draw_smoke.c @@ -99,6 +99,7 @@ static void create_color_ramp(const struct ColorBand *coba, float *data) { for (int i = 0; i < TFUNC_WIDTH; i++) { BKE_colorband_evaluate(coba, (float)i / TFUNC_WIDTH, &data[i * 4]); + straight_to_premul_v4(&data[i * 4]); } } @@ -115,7 +116,7 @@ static GPUTexture *create_transfer_function(int type, const struct ColorBand *co break; } - GPUTexture *tex = GPU_texture_create_1d(TFUNC_WIDTH, GPU_RGBA8, data, NULL); + GPUTexture *tex = GPU_texture_create_1d(TFUNC_WIDTH, GPU_SRGB8_A8, data, NULL); MEM_freeN(data); |