[Bf-blender-cvs] [65870821da6] blender-v3.3-release: Fix: OBJ import unused parameter warning

[Philipp Oeser]

Commit: 65870821da69ebdf38c407a9a583b90c0693393a
Author: Philipp Oeser
Date:   Tue Aug 23 11:40:26 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB65870821da69ebdf38c407a9a583b90c0693393a

Fix: OBJ import unused parameter warning

Since {rB2542fda14d85}, `r_node` is an unused parameter.
Changed `load_texture_image` to reflect that.

Differential Revision: https://developer.blender.org/D15759

===================================================================

M	source/blender/io/wavefront_obj/importer/obj_import_mtl.cc

===================================================================

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 02e09a77a5d..a863111b165 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
@@ -97,10 +97,8 @@ static Image *create_placeholder_image(Main *bmain, const std::string &path)
 
 static Image *load_texture_image(Main *bmain,
                                  const tex_map_XX &tex_map,
-                                 bNode *r_node,
                                  bool relative_paths)
 {
-  BLI_assert(r_node && r_node->type == SH_NODE_TEX_IMAGE);
   Image *image = nullptr;
 
   /* First try treating texture path as relative. */
@@ -371,7 +369,8 @@ void ShaderNodetreeWrap::add_image_textures(Main *bmain, Material *mat, bool rel
     }
 
     bNode *image_texture = add_node_to_tree(SH_NODE_TEX_IMAGE);
-    Image *image = load_texture_image(bmain, texture_map.value, image_texture, relative_paths);
+    BLI_assert(image_texture);
+    Image *image = load_texture_image(bmain, texture_map.value, relative_paths);
     if (image == nullptr) {
       continue;
     }