Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up diff

Browse source
This commit is contained in:
Seth Alves 2015-05-21 18:18:04 -07:00
parent f85cc89946
commit 1100c832eb
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,6 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
RenderableDebugableEntityItem::render(this, args); RenderableDebugableEntityItem::render(this, args);
} }
// virtual
Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) { Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) {
Model* result = NULL; Model* result = NULL;
@ -208,11 +207,11 @@ Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) {
_myRenderer = renderer; _myRenderer = renderer;
} }
assert(_myRenderer == renderer); // you should only ever render on one renderer assert(_myRenderer == renderer); // you should only ever render on one renderer
if (QThread::currentThread() != _myRenderer->thread()) { if (QThread::currentThread() != _myRenderer->thread()) {
return _model; return _model;
} }
_needsModelReload = false; // this is the reload _needsModelReload = false; // this is the reload
// if we have a URL, then we will want to end up returning a model... // if we have a URL, then we will want to end up returning a model...