blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T91670: Strip text position is incorrect 

Use `sseq->timeline_overlay.flag` instead of `sseq->flag`.
Caused oversight in 7cb65e4581.
This commit is contained in:
Richard Antalik 2021-10-07 06:35:16 +02:00
parent 70cc80ea1c
commit eadbacdbb0
Notes: blender-bot 2023-02-14 05:52:32 +01:00 
Referenced by issue #92003, Geometry Nodes + EEVEE: Vertex colours work on linux, not on windows
Referenced by issue #91670, VSE: Color strips are missing content color and overlay texts are not on top
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -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);