Commit: f382e3d5cb553db14b30861803cc35a4c6f716a7 Author: Michael Kowalski Date: Fri Nov 19 13:57:12 2021 -0500 Branches: temp-usd-udim-import https://developer.blender.org/rBf382e3d5cb553db14b30861803cc35a4c6f716a7
This review fixes USD Preview Surface import bugs reported in T90535 (missing materials in Animal Logic's ALab). Differential Revision: https://developer.blender.org/D13297 =================================================================== M source/blender/editors/io/io_usd.c M source/blender/io/usd/intern/usd_reader_material.cc =================================================================== diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c index 39f09014a61..1c57615969e 100644 --- a/source/blender/editors/io/io_usd.c +++ b/source/blender/editors/io/io_usd.c @@ -539,12 +539,13 @@ void WM_OT_usd_import(struct wmOperatorType *ot) 0.0001f, 1000.0f); - RNA_def_enum(ot->srna, - "mtl_name_collision_mode", - rna_enum_usd_mtl_name_collision_mode_items, - USD_MTL_NAME_COLLISION_MODIFY, - "Material Name Collision", - "Behavior when the name of an imported material conflicts with an existing material"); + RNA_def_enum( + ot->srna, + "mtl_name_collision_mode", + rna_enum_usd_mtl_name_collision_mode_items, + USD_MTL_NAME_COLLISION_MODIFY, + "Material Name Collision", + "Behavior when the name of an imported material conflicts with an existing material"); } #endif /* WITH_USD */ diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index c09b8ee1e2d..aa65c67cdff 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -197,7 +197,7 @@ static bool get_udim_tiles(const std::string &file_path, int id = BLI_path_sequence_decode(dir[i].relname, head, tail, &digits); if (digits == 0 || digits > 4 || !(STREQLEN(base_head, head, FILE_MAX)) || - !(STREQLEN(base_tail, tail, FILE_MAX))) { + !(STREQLEN(base_tail, tail, FILE_MAX))) { continue; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
