[Bf-blender-cvs] [7cd91a06ebc] master: Fix T88908: Incorrect path handling in adding strips
Richard Antalik
noreply at git.blender.org
Wed Jul 14 13:57:04 CEST 2021
Commit: 7cd91a06ebc15729867c9bb2b56fb36f21ecb5e1
Author: Richard Antalik
Date: Wed Jul 14 13:45:19 2021 +0200
Branches: master
https://developer.blender.org/rB7cd91a06ebc15729867c9bb2b56fb36f21ecb5e1
Fix T88908: Incorrect path handling in adding strips
When image strip is added from python using `image_strip_add` operator
and directory path is not terminated with slash, last part of directory
was ignored.
Use `BLI_join_dirfile` instead of simple string concatenation.
===================================================================
M source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index ac31e0e7c37..1239286d4da 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -260,7 +260,7 @@ static void load_data_init_from_operator(SeqLoadData *load_data, bContext *C, wm
RNA_PROP_BEGIN (op->ptr, itemptr, prop) {
char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0);
BLI_strncpy(load_data->name, filename, sizeof(load_data->name));
- BLI_snprintf(load_data->path, sizeof(load_data->path), "%s%s", directory, filename);
+ BLI_join_dirfile(load_data->path, sizeof(load_data->path), directory, filename);
MEM_freeN(filename);
break;
}
More information about the Bf-blender-cvs
mailing list