From eefe26d96ab6192fa68d1cd661207be0325692e9 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Thu, 12 Nov 2015 09:24:49 -0800 Subject: [PATCH] fix crash in Model::deleteGeometry when _rig is not initialized --- libraries/render-utils/src/Model.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 5b9bfdca3d..700b88e97b 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1099,10 +1099,12 @@ void Model::setGeometry(const QSharedPointer& newGeometry) { void Model::deleteGeometry() { _blendedVertexBuffers.clear(); - _rig->clearJointStates(); _meshStates.clear(); - _rig->deleteAnimations(); - _rig->destroyAnimGraph(); + if (_rig) { + _rig->clearJointStates(); + _rig->deleteAnimations(); + _rig->destroyAnimGraph(); + } _blendedBlendshapeCoefficients.clear(); }