Merge pull request #5493 from thoys/fix-model-overlay-rig-crash

Fix crash for ModelOverlays, caused by Rig changes
This commit is contained in:
Howard Stearns 2015-08-04 07:23:52 -07:00
commit 597316b208

View file

@ -10,6 +10,7 @@
//
#include "ModelOverlay.h"
#include "EntityRig.h"
#include "Application.h"
@ -17,7 +18,7 @@
QString const ModelOverlay::TYPE = "model";
ModelOverlay::ModelOverlay()
: _model(nullptr),
: _model(std::make_shared<EntityRig>()),
_modelTextures(QVariantMap()),
_updateModel(false)
{
@ -27,7 +28,7 @@ ModelOverlay::ModelOverlay()
ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) :
Volume3DOverlay(modelOverlay),
_model(nullptr),
_model(std::make_shared<EntityRig>()),
_modelTextures(QVariantMap()),
_url(modelOverlay->_url),
_updateModel(false)