diff options
| author | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
| commit | c7904d2398fd4d43d15268c792aa15ea8ee538fe (patch) | |
| tree | 484fd7f66ac59c82abd4aca18894f991b4935483 /source/blender/sequencer/intern/strip_add.c | |
| parent | 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (diff) | |
| parent | 1a100d2d78c75c9a6ac015606cc16698e7775682 (diff) | |
Merge branch 'master' into ui-asset-view-templateui-asset-view-template
Diffstat (limited to 'source/blender/sequencer/intern/strip_add.c')
| -rw-r--r-- | source/blender/sequencer/intern/strip_add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/strip_add.c b/source/blender/sequencer/intern/strip_add.c index 33dd74cb527..55d92c1eb10 100644 --- a/source/blender/sequencer/intern/strip_add.c +++ b/source/blender/sequencer/intern/strip_add.c @@ -324,7 +324,7 @@ Sequence *SEQ_add_image_strip(Main *bmain, Scene *scene, ListBase *seqbase, SeqL /* Set initial scale based on load_data->fit_method. */ char file_path[FILE_MAX]; - BLI_join_dirfile(file_path, sizeof(file_path), load_data->path, load_data->name); + BLI_strncpy(file_path, load_data->path, sizeof(file_path)); BLI_path_abs(file_path, BKE_main_blendfile_path(bmain)); ImBuf *ibuf = IMB_loadiffname(file_path, IB_rect, seq->strip->colorspace_settings.name); if (ibuf != NULL) { |