archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

USD import: fixed compiler warnings.

Browse Source 
Removed unused function and assignment in
a conditional expression.
This commit is contained in:
Michael Kowalski
2022-10-06 10:33:43 -04:00
parent 689e6a1be7
commit 8703e17ace
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/io/usd/intern/usd_reader_mesh.cc
View File

@@ -48,20 +48,6 @@ static const pxr::TfToken normalsPrimvar("normals", pxr::TfToken::Immortal);
} // namespace usdtokens } // namespace usdtokens
namespace utils { namespace utils {
/* Very similar to #blender::io::alembic::utils. */
static void build_mat_map(const Main *bmain, std::map<std::string, Material *> *r_mat_map)
{
if (r_mat_map == nullptr) {
return;
}
Material *material = static_cast<Material *>(bmain->materials.first);
for (; material; material = static_cast<Material *>(material->id.next)) {
/* We have to do this because the stored material name is coming directly from USD. */
(*r_mat_map)[pxr::TfMakeValidIdentifier(material->id.name + 2)] = material;
}
}
static pxr::UsdShadeMaterial compute_bound_material(const pxr::UsdPrim &prim) static pxr::UsdShadeMaterial compute_bound_material(const pxr::UsdPrim &prim)
{ {

4
source/blender/io/usd/intern/usd_reader_stage.cc
View File

@@ -332,8 +332,8 @@ void USDStageReader::import_all_materials(Main *bmain)
} }
/* Add the material now. */ /* Add the material now. */
if (blend_mtl = mtl_reader.add_material(usd_mtl)) { blend_mtl = mtl_reader.add_material(usd_mtl);
if (blend_mtl) {
if (params_.mtl_name_collision_mode == USD_MTL_NAME_COLLISION_MAKE_UNIQUE) { if (params_.mtl_name_collision_mode == USD_MTL_NAME_COLLISION_MAKE_UNIQUE) {
/* Record the name of the Blender material we created for the USD material /* Record the name of the Blender material we created for the USD material
* with the given path, so we don't import the material again if the * with the given path, so we don't import the material again if the