[Bf-blender-cvs] [91c4e3e2a5b] soc-2021-vse-strip-thumbnails: Changed ordering of drawing function in draw_seq_strip
Aditya Y Jeppu
noreply at git.blender.org
Tue Jun 29 13:53:52 CEST 2021
Commit: 91c4e3e2a5b847210c4c825105e9f3997b9f307b
Author: Aditya Y Jeppu
Date: Tue Jun 29 17:22:03 2021 +0530
Branches: soc-2021-vse-strip-thumbnails
https://developer.blender.org/rB91c4e3e2a5b847210c4c825105e9f3997b9f307b
Changed ordering of drawing function in draw_seq_strip
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 9005161c71f..5c38838039c 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1260,6 +1260,10 @@ static void draw_seq_strip(const bContext *C,
drawmeta_contents(scene, seq, x1, y1, x2, y2);
}
+ if (seq->type == SEQ_TYPE_MOVIE || seq->type == SEQ_TYPE_IMAGE) {
+ draw_seq_strip_thumbnail(v2d, C, sseq, scene, seq, x1, y1, x2, y2, pixelx, pixely);
+ }
+
if ((sseq->flag & SEQ_SHOW_STRIP_OVERLAY) && (sseq->flag & SEQ_SHOW_FCURVES)) {
draw_seq_fcurve_overlay(scene, v2d, seq, x1, y1, x2, y2, pixelx);
}
@@ -1288,10 +1292,6 @@ static void draw_seq_strip(const bContext *C,
draw_seq_invalid(x1, x2, y2, text_margin_y);
}
- if (seq->type == SEQ_TYPE_MOVIE || seq->type == SEQ_TYPE_IMAGE) {
- draw_seq_strip_thumbnail(v2d, C, sseq, scene, seq, x1, y1, x2, y2, pixelx, pixely);
- }
-
pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
More information about the Bf-blender-cvs
mailing list