blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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
This commit is contained in:
Philipp Oeser 2022-08-23 11:40:26 +02:00
parent 0bc95b7b40
commit 65870821da
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
View File

@ -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;
}