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

Merge pull request #6917 from AndrewMeadows/cf-empty-model-url

Browse source 
fix crash for empty modelUrl in ModelEntityItem
This commit is contained in:
Zach Pomerantz 2016-01-25 16:09:00 -08:00
commit 15ff106947
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -480,13 +480,18 @@ Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) {
} else { // we already have the model we want... } else { // we already have the model we want...
result = _model; result = _model;
} }
} else { // if our desired URL is empty, we may need to delete our existing model } else if (_model) {
if (_model) { // remove from scene
render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
render::PendingChanges pendingChanges;
_model->removeFromScene(scene, pendingChanges);
scene->enqueuePendingChanges(pendingChanges);
// release interest
_myRenderer->releaseModel(_model); _myRenderer->releaseModel(_model);
result = _model = NULL; result = _model = NULL;
_needsInitialSimulation = true; _needsInitialSimulation = true;
} }
}
return result; return result;
} }