Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2022-11-07 17:35:32 +0300
committerJulian Eisel <julian@blender.org>2022-11-07 17:35:32 +0300
commit61eb425db8269a01aff47845735d0a8a9d991a60 (patch)
tree4e2a1b6f90f35ace1e8d388591f283a5084c7e35 /source/blender/editors/space_sequencer/sequencer_draw.c
parentefaeed1c1704b84187ff3d17a595c1df1f13c65c (diff)
parent8473b5a59291134b43fe055aad63daacaccb8f4f (diff)
Merge branch 'master' into temp-asset-representation
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index a6916f9d031..3a2c62326de 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -890,8 +890,7 @@ static size_t draw_seq_text_get_overlay_string(const Scene *scene,
BLI_assert(i <= ARRAY_SIZE(text_array));
- return BLI_string_join_array(r_overlay_string, overlay_string_len, text_array, i) -
- r_overlay_string;
+ return BLI_string_join_array(r_overlay_string, overlay_string_len, text_array, i);
}
/* Draw info text on a sequence strip. */