From f85cc89946ee3ad492ec7dec8c721b228da8a286 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 21 May 2015 18:17:07 -0700 Subject: [PATCH] clean up diff --- libraries/entities-renderer/src/RenderableModelEntityItem.h | 4 ++-- libraries/entities/src/ModelEntityItem.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h index 886ae78a83..efd60faedc 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.h +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h @@ -49,7 +49,7 @@ public: bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, void** intersectedObject, bool precisionPicking) const; - virtual Model* getModel(EntityTreeRenderer* renderer); + Model* getModel(EntityTreeRenderer* renderer); bool needsToCallUpdate() const; @@ -65,7 +65,7 @@ private: Model* _model; bool _needsInitialSimulation; - bool _needsModelReload = true; + bool _needsModelReload; EntityTreeRenderer* _myRenderer; QString _currentTextures; QStringList _originalTextures; diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index abfa38250c..d4a4efda04 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -56,7 +56,7 @@ public: const rgbColor& getColor() const { return _color; } xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; } - virtual bool hasModel() const { return !_modelURL.isEmpty(); } + bool hasModel() const { return !_modelURL.isEmpty(); } virtual bool hasCompoundShapeURL() const { return !_compoundShapeURL.isEmpty(); } static const QString DEFAULT_MODEL_URL;