blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix: USD import: deform group name collision #111747

Open
Michael Kowalski wants to merge 7 commits from makowalski/blender:usd_deform_group_name_collision into main
pull from: makowalski/blender:usd_deform_group_name_collision
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 18 Commits 7 Files Changed 1 +26 -15
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d75a9d9df - Show all commits

41
source/blender/io/usd/intern/usd_skel_convert.cc
View File

@ -328,6 +328,29 @@ void import_skeleton_curves(Main *bmain,
std::for_each(scale_curves.begin(), scale_curves.end(), recalc_handles);
}
/* If the given mesh has an attribute with the given name, rename the
makowalski marked this conversation as resolved Outdated
Hans Goudey commented 2023-09-12 23:07:05 +02:00
Outdated
Review
Copy Link

Use doxygen syntax:

/**
 * Text here...
 */
Use doxygen syntax: ``` /** * Text here... */
* attribute to a unique name. */
void check_attribute_name_collision(const std::string &name, Mesh *mesh)
{
blender::bke::MutableAttributeAccessor attribs = mesh->attributes_for_write();
if (attribs.contains(name)) {
char uniquename[MAX_CUSTOMDATA_LAYER_NAME];
BKE_id_attribute_calc_unique_name(&mesh->id, name.c_str(), uniquename);
WM_reportf(
RPT_WARNING,
"Attribute '%s' from mesh '%s' renamed to '%s' because of name conflict with vertex group",
name.c_str(),
mesh->id.name + 2,
uniquename);
if (!attribs.rename(name, uniquename)) {
WM_reportf(RPT_WARNING, "Attribute rename to %s failed", uniquename);
}
}
}
} // End anonymous namespace.
namespace blender::io::usd {
@ -1006,27 +1029,15 @@ void import_mesh_skel_bindings(Main *bmain, Object *mesh_obj, const pxr::UsdPrim
std::vector<bDeformGroup *> joint_def_grps(joints.size(), nullptr);
/* We must be careful about name collisions with existing attributes when creating
* deform groups, because in the call to BKE_object_defgroup_add_name() below
* deform groups, because in the call to #BKE_object_defgroup_add_name() below
* the deform group is given a unique name if there is already an attribute with
* the same name. To ensure that deform groups preserve the required bone names, we
* will remove attributes with colliding names before adding the groups. */
bke::MutableAttributeAccessor attributes = mesh->attributes_for_write();
* will rename attributes with colliding names before adding the groups. */
for (int idx : used_indices) {
std::string joint_name = pxr::SdfPath(joints[idx]).GetName();
if (!BKE_object_defgroup_find_name(mesh_obj, joint_name.c_str())) {
/* If there is an attribute with the same name, remove it. */
bke::AttributeIDRef attr_id(joint_name);
if (attributes.contains(attr_id)) {
WM_reportf(
RPT_WARNING,
"%s: Removing attribute '%s' from mesh '%s', as it conflicts with a deform group "
"for a bone with the same name",
__func__,
joint_name.c_str(),
mesh->id.name + 2);
attributes.remove(attr_id);
}
check_attribute_name_collision(joint_name, mesh);
bDeformGroup *def_grp = BKE_object_defgroup_add_name(mesh_obj, joint_name.c_str());
joint_def_grps[idx] = def_grp;
}