blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

USD Import: fix error messages loading instances. 

Added logic to avoid attempting to bind the pxr::UsdSkelBindingAPI
to instance proxies and prototypes, as this was generating errors.
This commit is contained in:
Michael Kowalski 2022-10-19 15:15:47 -04:00
parent cf8cf884d1
commit 471636ffcd
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,20 +1093,22 @@ bool USDMeshReader::get_local_usd_xform(pxr::GfMatrix4d *r_xform,
return USDXformReader::get_local_usd_xform(r_xform, r_is_constant, time);
}
if (pxr::UsdSkelBindingAPI skel_api = pxr::UsdSkelBindingAPI::Apply(prim_)) {
if (skel_api.GetGeomBindTransformAttr().HasAuthoredValue()) {
pxr::GfMatrix4d bind_xf;
if (skel_api.GetGeomBindTransformAttr().Get(&bind_xf)) {
/* Assume that if a bind transform is defined, then the
* transform is constant. */
if (r_is_constant) {
*r_is_constant = true;
if (!(prim_.IsInstanceProxy() || prim_.IsInPrototype())) {
if (pxr::UsdSkelBindingAPI skel_api = pxr::UsdSkelBindingAPI::Apply(prim_)) {
if (skel_api.GetGeomBindTransformAttr().HasAuthoredValue()) {
pxr::GfMatrix4d bind_xf;
if (skel_api.GetGeomBindTransformAttr().Get(&bind_xf)) {
/* Assume that if a bind transform is defined, then the
* transform is constant. */
if (r_is_constant) {
*r_is_constant = true;
}
return get_geom_bind_xform_correction(bind_xf, r_xform, time);
}
else {
std::cout << "WARNING: couldn't compute geom bind transform for " << prim_.GetPath()
<< std::endl;
}
return get_geom_bind_xform_correction(bind_xf, r_xform, time);
}
else {
std::cout << "WARNING: couldn't compute geom bind transform for " << prim_.GetPath()
<< std::endl;
}
}
}

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

@ -586,6 +586,12 @@ void import_skel_bindings(Main *bmain, Object *mesh_obj, pxr::UsdPrim prim)
return;
}
if (prim.IsInstanceProxy() || prim.IsInPrototype()) {
/* Attempting to create a UsdSkelBindingAPI for
* instance proxies and prototypes generates USD errors. */
return;
}
if (mesh_obj->type != OB_MESH) {
return;
}