Merge pull request #15596 from AndrewMeadows/fix-crash-bugz178

BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model (redux)
This commit is contained in:
Shannon Romano 2019-05-21 12:50:26 -07:00 committed by GitHub
commit b1edfdcaef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -363,7 +363,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
ShapeType type = getShapeType();
auto model = getModel();
if (!model) {
if (!model || !model->isLoaded()) {
type = SHAPE_TYPE_NONE;
}