diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2022-08-23 16:09:50 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2022-08-23 16:09:50 +0300 |
| commit | a77a1bcae759a585599ca813215e23654062dbaa (patch) | |
| tree | 9fa56df9fc2f77acda72351a05c3f36224834db9 /source/blender/io/wavefront_obj/importer | |
| parent | 37533cd6cb0fcd6e92906cfcec911330df27f52c (diff) | |
| parent | efc9faef23fdbc3e3eb0d88ed096aa269a294f01 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/io/wavefront_obj/importer')
| -rw-r--r-- | source/blender/io/wavefront_obj/importer/obj_import_mtl.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc index a863111b165..093cbec32fe 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc @@ -95,9 +95,7 @@ static Image *create_placeholder_image(Main *bmain, const std::string &path) return image; } -static Image *load_texture_image(Main *bmain, - const tex_map_XX &tex_map, - bool relative_paths) +static Image *load_texture_image(Main *bmain, const tex_map_XX &tex_map, bool relative_paths) { Image *image = nullptr; |