diff options
| author | Campbell Barton <campbell@blender.org> | 2022-11-03 06:17:54 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-11-03 06:32:50 +0300 |
| commit | 92b2f4d24999d463d20e7a134bff414f0a8a9d77 (patch) | |
| tree | eab2c16e77f7592288eba55117c8ebc1bb5f10f4 /source/blender/editors | |
| parent | 5ba045af7b3bebf2e4a7e1098f35ad134fbd78e8 (diff) | |
BLI_string: C++ support for string joining macros
C++ doesn't support taking the temporary address of a temporary array,
use inline functions instead.
Also change array joining functions to return the length of the string
instead of returning the pointer (matching BLI_path_join).
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 3 |
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. */ |