blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

USD import: fix crash on empty blendshapes. 

Now guarding against an empty offsets array and
out-of-bounds offset indices.
This commit is contained in:
Michael Kowalski 2023-01-08 20:54:57 -05:00
parent 921fc1e44c
commit 56a97ba816
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,6 +260,11 @@ void import_blendshapes(Main *bmain, Object *obj, pxr::UsdPrim prim)
continue;
}
if (offsets.empty()) {
std::cout << "No offsets for blendshape " << path << std::endl;
continue;
}
shapekey_names.insert(blendshapes[i]);
kb = BKE_keyblock_add(key, blendshapes[i].GetString().c_str());
@ -274,6 +279,11 @@ void import_blendshapes(Main *bmain, Object *obj, pxr::UsdPrim prim)
if (point_indices.empty()) {
for (int a = 0; a < kb->totelem; ++a, fp += 3) {
if (a >= offsets.size()) {
std::cout << "Number of offsets greater than number of mesh vertices for blendshape "
<< path << std::endl;
break;
}
add_v3_v3(fp, offsets[a].data());
}
}
@ -281,10 +291,14 @@ void import_blendshapes(Main *bmain, Object *obj, pxr::UsdPrim prim)
int a = 0;
for (int i : point_indices) {
if (i < 0 || i > kb->totelem) {
std::cout << "out of bounds point index " << i << std::endl;
std::cout << "Out of bounds point index " << i << " for blendshape " << path << std::endl;
++a;
continue;
}
if (a >= offsets.size()) {
std::cout << "Number of offsets greater than number of mesh vertices for blendshape " << path << std::endl;
break;
}
add_v3_v3(&fp[3 * i], offsets[a].data());
++a;
}