[Bf-blender-cvs] [eadbacdbb06] master: Fix T91670: Strip text position is incorrect
Richard Antalik
noreply at git.blender.org
Thu Oct 7 06:38:44 CEST 2021
Commit: eadbacdbb06ab1ea4b0c744c31959bdf2f41bc98
Author: Richard Antalik
Date: Thu Oct 7 06:35:16 2021 +0200
Branches: master
https://developer.blender.org/rBeadbacdbb06ab1ea4b0c744c31959bdf2f41bc98
Fix T91670: Strip text position is incorrect
Use `sseq->timeline_overlay.flag` instead of `sseq->flag`.
Caused oversight in 7cb65e45814d.
===================================================================
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 bbe2def8081..e5e241c8b7e 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1342,9 +1342,9 @@ static void draw_seq_strip(const bContext *C,
float text_margin_y;
bool y_threshold;
- if ((sseq->flag & SEQ_TIMELINE_SHOW_STRIP_NAME) ||
- (sseq->flag & SEQ_TIMELINE_SHOW_STRIP_SOURCE) ||
- (sseq->flag & SEQ_TIMELINE_SHOW_STRIP_DURATION)) {
+ if ((sseq->timeline_overlay.flag & SEQ_TIMELINE_SHOW_STRIP_NAME) ||
+ (sseq->timeline_overlay.flag & SEQ_TIMELINE_SHOW_STRIP_SOURCE) ||
+ (sseq->timeline_overlay.flag & SEQ_TIMELINE_SHOW_STRIP_DURATION)) {
/* Calculate height needed for drawing text on strip. */
text_margin_y = y2 - min_ff(0.40f, 20 * U.dpi_fac * pixely);
More information about the Bf-blender-cvs
mailing list