[Bf-blender-cvs] [cf573763bb4] uvimage-editor-drawing: Fix drawing render result
Jeroen Bakker
noreply at git.blender.org
Mon Aug 24 15:04:30 CEST 2020
Commit: cf573763bb4a52c43dc87efc27eb18fa6ceaf3c6
Author: Jeroen Bakker
Date: Mon Aug 24 15:03:50 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBcf573763bb4a52c43dc87efc27eb18fa6ceaf3c6
Fix drawing render result
This fix applies that the float-buffer isn't premultiplied for render
results. What is strange.
===================================================================
M source/blender/draw/engines/image/image_engine.c
===================================================================
diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c
index abe6cce8afa..348813d354f 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -167,7 +167,7 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
if ((sima->flag & SI_USE_ALPHA) != 0) {
/* Show RGBA */
- draw_flags |= SIMA_DRAW_FLAG_SHOW_ALPHA;
+ draw_flags |= SIMA_DRAW_FLAG_SHOW_ALPHA | SIMA_DRAW_FLAG_APPLY_ALPHA;
}
else if ((sima->flag & SI_SHOW_ALPHA) != 0) {
draw_flags |= SIMA_DRAW_FLAG_SHUFFLING;
@@ -189,6 +189,9 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
draw_flags |= SIMA_DRAW_FLAG_APPLY_ALPHA | SIMA_DRAW_FLAG_SHUFFLING;
copy_v4_fl4(shuffle, 0.0f, 0.0f, 1.0f, 0.0f);
}
+ else /* RGB */ {
+ draw_flags |= SIMA_DRAW_FLAG_APPLY_ALPHA;
+ }
GPUShader *shader = IMAGE_shader_image_get();
DRWShadingGroup *shgrp = DRW_shgroup_create(shader, psl->image_pass);
More information about the Bf-blender-cvs
mailing list