From 2516066e1dc0e15502acdade327b7287aeeb6280 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 27 May 2015 10:40:07 -0700 Subject: [PATCH] some hacking --- interface/src/Application.h | 3 +++ libraries/entities-renderer/src/RenderableEntityItem.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index 79a75eef43..fb262ad2aa 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -348,6 +348,9 @@ public: void setMaxOctreePacketsPerSecond(int maxOctreePPS); int getMaxOctreePacketsPerSecond(); + + render::ScenePointer getMain3DScene() { return _main3DScene; } + render::EnginePointer getRenderEngine() { return _renderEngine; } signals: diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h index 5f63fe84c2..658f78ed47 100644 --- a/libraries/entities-renderer/src/RenderableEntityItem.h +++ b/libraries/entities-renderer/src/RenderableEntityItem.h @@ -19,9 +19,7 @@ class RenderableEntityItem { public: typedef render::Payload Payload; typedef std::shared_ptr PayloadPointer; - //typedef Payload::DataPointer Pointer; typedef EntityItemPointer Pointer; - }; #endif // hifi_RenderableEntityItem_h