From 4bf6f8ed7798a056eaa788535c261c0e8449f837 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 4 Aug 2015 14:47:13 +0200 Subject: [PATCH] ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model. --- interface/src/ui/overlays/ModelOverlay.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp index de8e05323b..49321e7d6d 100644 --- a/interface/src/ui/overlays/ModelOverlay.cpp +++ b/interface/src/ui/overlays/ModelOverlay.cpp @@ -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()), _modelTextures(QVariantMap()), _updateModel(false) { @@ -27,7 +28,7 @@ ModelOverlay::ModelOverlay() ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) : Volume3DOverlay(modelOverlay), - _model(nullptr), + _model(std::make_shared()), _modelTextures(QVariantMap()), _url(modelOverlay->_url), _updateModel(false)