blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Alembic: catch weird exceptions from library instead of aborting Blender. 

Similar to what is done e.g. in AbcMeshReader::read_mesh()...
This commit is contained in:
Bastien Montagne 2019-04-18 16:19:17 +02:00
parent 7d78474941
commit 9954cce59f
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/alembic/intern/abc_object.cc
View File

@ -273,7 +273,15 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
{
/* Check that we have an empty object (locator, bone head/tail...). */
if (IXform::matches(m_iobject.getMetaData())) {
return IXform(m_iobject, Alembic::AbcGeom::kWrapExisting);
try {
return IXform(m_iobject, Alembic::AbcGeom::kWrapExisting);
}
catch (Alembic::Util::Exception &ex) {
printf("Alembic: error reading object transform for '%s': %s\n",
m_iobject.getFullName().c_str(),
ex.what());
return IXform();
}
}
/* Check that we have an object with actual data, in which case the
@ -282,7 +290,15 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
/* The archive's top object can be recognised by not having a parent. */
if (abc_parent.getParent() && IXform::matches(abc_parent.getMetaData())) {
return IXform(abc_parent, Alembic::AbcGeom::kWrapExisting);
try {
return IXform(abc_parent, Alembic::AbcGeom::kWrapExisting);
}
catch (Alembic::Util::Exception &ex) {
printf("Alembic: error reading object transform for '%s': %s\n",
abc_parent.getFullName().c_str(),
ex.what());
return IXform();
}
}
/* This can happen in certain cases. For example, MeshLab exports