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/blenkernel/intern/packedFile.c | |
| parent | fc8f9e420426570dcb3e026ecbe8145cd0fae5ca (diff) | |
| parent | 53795877727d67185de858a480c8090ca7eb8e36 (diff) | |
Merge branch 'master' into bevelv2
Diffstat (limited to 'source/blender/blenkernel/intern/packedFile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 901b42ac0b2..0c9d9f5b048 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -545,7 +545,7 @@ static void unpack_generate_paths(const char *name, break; } if (dir_name) { - BLI_path_join(r_relpath, relpathlen, "//", dir_name, tempname, NULL); + BLI_path_join(r_relpath, relpathlen, "//", dir_name, tempname); } } |