diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
| commit | a41a1bfc494e4015406549e137114ef5a450aaf0 (patch) | |
| tree | dbdc95584f91aded4b777bac30074f9f78d8c89c /source/blender/sequencer/intern/utils.c | |
| parent | fc8f9e420426570dcb3e026ecbe8145cd0fae5ca (diff) | |
| parent | 53795877727d67185de858a480c8090ca7eb8e36 (diff) | |
Merge branch 'master' into bevelv2
Diffstat (limited to 'source/blender/sequencer/intern/utils.c')
| -rw-r--r-- | source/blender/sequencer/intern/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c index 6d182b6bcca..5b70bc33e88 100644 --- a/source/blender/sequencer/intern/utils.c +++ b/source/blender/sequencer/intern/utils.c @@ -224,7 +224,7 @@ void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile) /* reset all the previously created anims */ SEQ_relations_sequence_free_anim(seq); - BLI_join_dirfile(name, sizeof(name), seq->strip->dir, seq->strip->stripdata->name); + BLI_path_join(name, sizeof(name), seq->strip->dir, seq->strip->stripdata->name); BLI_path_abs(name, BKE_main_blendfile_path_from_global()); proxy = seq->strip->proxy; |