From 1100c832eb3877160d2f9f37f5f37f7ed3577ab7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 21 May 2015 18:18:04 -0700 Subject: [PATCH] clean up diff --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index f7e70b2b56..43112d7d73 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -199,7 +199,6 @@ void RenderableModelEntityItem::render(RenderArgs* args) { RenderableDebugableEntityItem::render(this, args); } -// virtual Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) { Model* result = NULL; @@ -208,11 +207,11 @@ Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) { _myRenderer = renderer; } assert(_myRenderer == renderer); // you should only ever render on one renderer - + if (QThread::currentThread() != _myRenderer->thread()) { return _model; } - + _needsModelReload = false; // this is the reload // if we have a URL, then we will want to end up returning a model...