[Bf-blender-cvs] [18e67813cd1] master: Clip editor: Fix drawing metadata for RGBA images

Sergey Sharybin noreply at git.blender.org
Wed Feb 6 10:48:51 CET 2019


Commit: 18e67813cd1b315f77fb194476b357a0e377e6d5
Author: Sergey Sharybin
Date:   Wed Feb 6 10:48:09 2019 +0100
Branches: master
https://developer.blender.org/rB18e67813cd1b315f77fb194476b357a0e377e6d5

Clip editor: Fix drawing metadata for RGBA images

Need to disable blending prior to drawing metadata. Otherwise
text will be drawn on a transparent background.

===================================================================

M	source/blender/editors/space_clip/clip_draw.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index dd9fbef8649..eb0e9bcf8d8 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -320,14 +320,15 @@ static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar,
 
 	glaDrawImBuf_glsl_ctx(C, ibuf, x, y, filter, zoomx * width / ibuf->x, zoomy * height / ibuf->y);
 
+	if (ibuf->planes == 32) {
+		GPU_blend(false);
+	}
+
 	if (sc->flag & SC_SHOW_METADATA) {
 		rctf frame;
 		BLI_rctf_init(&frame, 0.0f, ibuf->x, 0.0f, ibuf->y);
 		ED_region_image_metadata_draw(x, y, ibuf, &frame, zoomx * width / ibuf->x, zoomy * height / ibuf->y);
 	}
-
-	if (ibuf->planes == 32)
-		GPU_blend(false);
 }
 
 static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int height, float zoomx, float zoomy)



More information about the Bf-blender-cvs mailing list