diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp index 926889ccac..e5e0f2ff85 100644 --- a/libraries/entities-renderer/src/RenderableEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp @@ -32,9 +32,7 @@ namespace render { if (args) { args->_elementsTouched++; if (payload && payload->entity) { - if (payload->entity->getType() != EntityTypes::Model) { - payload->entity->render(args); - } + payload->entity->render(args); } } } diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.h b/libraries/entities-renderer/src/RenderableLightEntityItem.h index a90bb0baad..a0c424e240 100644 --- a/libraries/entities-renderer/src/RenderableLightEntityItem.h +++ b/libraries/entities-renderer/src/RenderableLightEntityItem.h @@ -13,6 +13,7 @@ #define hifi_RenderableLightEntityItem_h #include +#include "RenderableEntityItem.h" class RenderableLightEntityItem : public LightEntityItem { public: @@ -22,12 +23,13 @@ public: LightEntityItem(entityItemID, properties) { } - virtual bool canRenderInScene() { return false; } // we don't yet play well with others virtual void render(RenderArgs* args); virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, void** intersectedObject, bool precisionPicking) const; + + SIMPLE_RENDERABLE(); };