diff options
Diffstat (limited to 'source/blender/io/usd/intern/usd_reader_material.cc')
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_material.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index 6416f6861d4..bf4ee0ad208 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -757,7 +757,6 @@ void USDMaterialReader::convert_usd_primvar_reader_float2( link_nodes(ntree, uv_map, "UV", dest_node, dest_socket_name); } - void build_material_map(const Main *bmain, std::map<std::string, Material *> *r_mat_map) { if (r_mat_map == nullptr) { @@ -771,11 +770,10 @@ void build_material_map(const Main *bmain, std::map<std::string, Material *> *r_ } } -Material *find_existing_material( - const pxr::SdfPath &usd_mat_path, - const USDImportParams ¶ms, - const std::map<std::string, Material *> &mat_map, - const std::map<std::string, std::string> &usd_path_to_mat_name) +Material *find_existing_material(const pxr::SdfPath &usd_mat_path, + const USDImportParams ¶ms, + const std::map<std::string, Material *> &mat_map, + const std::map<std::string, std::string> &usd_path_to_mat_name) { if (params.mtl_name_collision_mode == USD_MTL_NAME_COLLISION_MAKE_UNIQUE) { /* Check if we've already created the Blender material with a modified name. */ |