Merge pull request #15779 from sethalves/bugz-709

bugz-709: don't try to create collision shape before compound shape resource is finished loading
This commit is contained in:
Andrew Meadows 2019-06-17 15:13:15 -07:00 committed by GitHub
commit 780cf6645e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -368,6 +368,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
}
if (type == SHAPE_TYPE_COMPOUND) {
if (!_compoundShapeResource || !_compoundShapeResource->isLoaded()) {
return;
}
updateModelBounds();
// should never fall in here when collision model not fully loaded