Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix

Browse source 
add guards to getShapeKey
This commit is contained in:
Brad Hefta-Gaub 2016-10-01 20:23:50 -07:00 committed by GitHub
commit 7ef8e53d03
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -397,7 +397,12 @@ ItemKey ModelMeshPartPayload::getKey() const {
} }
ShapeKey ModelMeshPartPayload::getShapeKey() const { ShapeKey ModelMeshPartPayload::getShapeKey() const {
assert(_model->isLoaded());
// guard against partially loaded meshes
if (!_model || !_model->isLoaded() || !_model->getGeometry()) {
return ShapeKey::Builder::invalid();
}
const FBXGeometry& geometry = _model->getFBXGeometry(); const FBXGeometry& geometry = _model->getFBXGeometry();
const auto& networkMeshes = _model->getGeometry()->getMeshes(); const auto& networkMeshes = _model->getGeometry()->getMeshes();