[Bf-blender-cvs] [64929398fba] master: Cleanup: skip accessing sequence strip name/source when hidden
Campbell Barton
noreply at git.blender.org
Mon Jan 11 08:00:37 CET 2021
Commit: 64929398fbab226fe275e91905f6892c08e8e85e
Author: Campbell Barton
Date: Mon Jan 11 17:58:08 2021 +1100
Branches: master
https://developer.blender.org/rB64929398fbab226fe275e91905f6892c08e8e85e
Cleanup: skip accessing sequence strip name/source when hidden
===================================================================
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 9e6a21791d4..72c3e43185b 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -683,23 +683,23 @@ static size_t draw_seq_text_get_overlay_string(SpaceSeq *sseq,
char *r_overlay_string,
size_t overlay_string_len)
{
- const char *name = draw_seq_text_get_name(seq);
- char source[FILE_MAX];
- draw_seq_text_get_source(seq, source, sizeof(source));
-
const char *text_sep = " | ";
const char *text_array[5];
int i = 0;
if (sseq->flag & SEQ_SHOW_STRIP_NAME) {
- text_array[i++] = name;
+ text_array[i++] = draw_seq_text_get_name(seq);
}
- if ((sseq->flag & SEQ_SHOW_STRIP_SOURCE) && (source[0] != '\0')) {
- if (i != 0) {
- text_array[i++] = text_sep;
+ char source[FILE_MAX];
+ if (sseq->flag & SEQ_SHOW_STRIP_SOURCE) {
+ draw_seq_text_get_source(seq, source, sizeof(source));
+ if (source[0] != '\0') {
+ if (i != 0) {
+ text_array[i++] = text_sep;
+ }
+ text_array[i++] = source;
}
- text_array[i++] = source;
}
char strip_duration_text[16];
More information about the Bf-blender-cvs
mailing list