diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2021-11-19 21:57:12 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2021-11-19 21:57:12 +0300 |
| commit | 73bc95224edc7cbc6c3f4129eb914a2f43a4df15 (patch) | |
| tree | 6b95c4eac6f825e97710666da520bd3f937ee2e6 | |
| parent | 05c4982f712be287b901713e6d8cfc0cbc208696 (diff) | |
USD Import: format fixes.temp-T90535-usd-alab-material-import
| -rw-r--r-- | source/blender/editors/io/io_usd.c | 13 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_material.cc | 2 |
2 files changed, 8 insertions, 7 deletions
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; } |