diff options
| author | Campbell Barton <campbell@blender.org> | 2022-10-17 03:16:41 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-10-17 03:16:41 +0300 |
| commit | 1d1cade9a9a7f75034669520e39c56959917803a (patch) | |
| tree | 92482d85f4199f1f65ebcb4b04b6c2cf4a4a0ea4 /source/blender/io/wavefront_obj/importer | |
| parent | 2f3f208901b5bf0fde7fbc9c3f02b66f7591b169 (diff) | |
BLI_path: remove trailing NULL argument to BLI_path_join
Using varargs had the disadvantages, replace with a macro which has
some advantages.
- Arguments are type checked.
- Less verbose.
- Unintended NULL arguments would silently terminate joining paths.
- Passing in a NULL argument warns with GCC.
Diffstat (limited to 'source/blender/io/wavefront_obj/importer')
| -rw-r--r-- | source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc index 0781028c880..7d5f023af4b 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc @@ -765,7 +765,7 @@ MTLParser::MTLParser(StringRefNull mtl_library, StringRefNull obj_filepath) { char obj_file_dir[FILE_MAXDIR]; BLI_split_dir_part(obj_filepath.data(), obj_file_dir, FILE_MAXDIR); - BLI_path_join(mtl_file_path_, FILE_MAX, obj_file_dir, mtl_library.data(), nullptr); + BLI_path_join(mtl_file_path_, FILE_MAX, obj_file_dir, mtl_library.data()); BLI_split_dir_part(mtl_file_path_, mtl_dir_path_, FILE_MAXDIR); } |