blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

USD Import: Added mesh validation on import as an option #121054

Merged
Jesse Yurkovich merged 3 commits from CharlesWardlaw/blender:feature/usd_validate_meshes into main 2024-04-25 01:47:18 +02:00
Conversation 1 Commits 3 Files Changed 2 +18 -1
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/io/io_usd.cc
View File

@ -578,6 +578,8 @@ static int wm_usd_import_exec(bContext *C, wmOperator *op)
const eUSDAttrImportMode attr_import_mode = eUSDAttrImportMode(
RNA_enum_get(op->ptr, "attr_import_mode"));
const bool validate_meshes = RNA_boolean_get(op->ptr, "validate_meshes");
/* TODO(makowalski): Add support for sequences. */
const bool is_sequence = false;
int offset = 0;
@ -589,7 +591,6 @@ static int wm_usd_import_exec(bContext *C, wmOperator *op)
blender::ed::object::mode_set(C, OB_MODE_EDIT);
}
const bool validate_meshes = false;
const bool use_instancing = false;
const eUSDTexImportMode import_textures_mode = eUSDTexImportMode(
@ -674,6 +675,7 @@ static void wm_usd_import_draw(bContext * /*C*/, wmOperator *op)
uiItemR(col, ptr, "read_mesh_uvs", UI_ITEM_NONE, nullptr, ICON_NONE);
uiItemR(col, ptr, "read_mesh_colors", UI_ITEM_NONE, nullptr, ICON_NONE);
uiItemR(col, ptr, "read_mesh_attributes", UI_ITEM_NONE, nullptr, ICON_NONE);
uiItemR(col, ptr, "validate_meshes", UI_ITEM_NONE, nullptr, ICON_NONE);
col = uiLayoutColumnWithHeading(box, true, IFACE_("Include"));
uiItemR(col, ptr, "import_subdiv", UI_ITEM_NONE, IFACE_("Subdivision"), ICON_NONE);
uiItemR(col, ptr, "support_scene_instancing", UI_ITEM_NONE, nullptr, ICON_NONE);
@ -884,6 +886,12 @@ void WM_OT_usd_import(wmOperatorType *ot)
USD_ATTR_IMPORT_ALL,
"Import Custom Properties",
"Behavior when importing USD attributes as Blender custom properties");
RNA_def_boolean(ot->srna,
"validate_meshes",
false,
"Validate Meshes",
"Check imported mesh objects for invalid data (slow)");
CharlesWardlaw marked this conversation as resolved Outdated
Jesse Yurkovich commented 2024-04-25 00:31:31 +02:00
Outdated
Review
Copy Link

Let's use the same sentence that both OBJ and Alembic use for their validate_meshes option: "Check imported mesh objects for invalid data (slow)"

Let's use the same sentence that both OBJ and Alembic use for their validate_meshes option: "Check imported mesh objects for invalid data (slow)"
}
namespace blender::ed::io {

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

@ -922,6 +922,9 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
* the topology is consistent, as in the Alembic importer. */
ImportSettings settings;
if (settings_) {
settings.validate_meshes = settings_->validate_meshes;
}
settings.read_flag |= params.read_flags;
if (topology_changed(existing_mesh, params.motion_sample_time)) {
@ -948,6 +951,12 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
}
}
if (settings.validate_meshes) {
if (BKE_mesh_validate(active_mesh, false, false)) {
BKE_reportf(reports(), RPT_INFO, "Fixed mesh for prim: %s", mesh_prim_.GetPath().GetText());
}
}
CharlesWardlaw marked this conversation as resolved
Jesse Yurkovich commented 2024-04-25 00:29:55 +02:00
Review
Copy Link

Should use BKE_reportf(reports(), RPT_INFO, "Fixed mesh for prim: %s", mesh_prim_.GetPath().GetText()); here and then can drop the WM_api.hh include also.

Should use `BKE_reportf(reports(), RPT_INFO, "Fixed mesh for prim: %s", mesh_prim_.GetPath().GetText());` here and then can drop the `WM_api.hh` include also.
return active_mesh;
}