Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
10.5.x.x (relative to 10.5.13.1)
========

Fixes
-----

- Alembic : Fixed crashes caused by invalid UVs.

10.5.13.1 (relative to 10.5.13.0)
=========
Expand Down
19 changes: 17 additions & 2 deletions contrib/IECoreAlembic/src/IECoreAlembic/MeshReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,23 @@ class MeshReader : public PrimitiveReader
}
}

PrimitiveVariable::Interpolation interpolation = PrimitiveReader::interpolation( uvs.getScope() );
primitive->variables["uv"] = PrimitiveVariable( interpolation, uvData, indexData );
const PrimitiveVariable primitiveVariable( PrimitiveReader::interpolation( uvs.getScope() ), uvData, indexData );
if( primitive->isPrimitiveVariableValid( primitiveVariable ) )
{
primitive->variables["uv"] = primitiveVariable;
}
else
{
IECore::msg(
IECore::Msg::Warning, "PrimitiveReader::readGeomParam",
boost::format(
"Ignoring invalid \"uv\" property on object \"%1%\" (size %2%, expected %3%)"
)
% uvs.getParent().getObject().getFullName()
% ( indexData ? indexData->readable().size() : uvData->readable().size() )
% primitive->variableSize( primitiveVariable.interpolation )
);
}
}

};
Expand Down