Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAras Pranckevicius <aras@nesnausk.org>2022-07-31 18:32:26 +0300
committerAras Pranckevicius <aras@nesnausk.org>2022-07-31 18:32:26 +0300
commit5b1ad3d7cfc29f69b6f340169e1fe2b0db7e3b45 (patch)
tree7aab24c8b131658081dca47a033b4a7ea1716cc1 /source/blender/io/wavefront_obj/importer
parent8c8c744f9d98fd0ff6ffc3b1d7e79a29e7f8e537 (diff)
parentbea52819190e54da2907e6c367b493db29f6f5c9 (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.cc2
1 files changed, 1 insertions, 1 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 60e419728f3..f7685ba0b7b 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
@@ -65,7 +65,7 @@ static bool load_texture_image_at_path(Main *bmain,
bNode *r_node,
const std::string &path)
{
- Image *tex_image = BKE_image_load(bmain, path.c_str());
+ Image *tex_image = BKE_image_load_exists(bmain, path.c_str());
if (!tex_image) {
fprintf(stderr, "Cannot load image file: '%s'\n", path.c_str());
return false;