Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 23:20:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model.

Browse source
This commit is contained in:
Thijs Wenker 2015-08-04 14:47:13 +02:00
parent 3f5f75d6d2
commit 4bf6f8ed77
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/ui/overlays/ModelOverlay.cpp
View file

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