From dd9d758da1e2da1d20d393235bf5071c06da2825 Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 26 May 2015 10:53:23 -0700 Subject: [PATCH] Fixing the compilation issue for real --- interface/src/Application.cpp | 4 +++- libraries/render/src/render/Scene.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 66f20ce3b0..ac9f058e1e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3400,7 +3400,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se static render::ItemID myFirstRenderItem = 0; if (myFirstRenderItem == 0) { - auto myFirstPayload = MyFirstStuff::PayloadPointer(new MyFirstStuff::Payload(MyFirstStuff::Pointer(new MyFirstStuff()))); + auto myVeryFirstStuff = MyFirstStuff::Pointer(new MyFirstStuff()); + auto myVeryFirstPayload = new MyFirstStuff::Payload(myVeryFirstStuff); + auto myFirstPayload = MyFirstStuff::PayloadPointer(myVeryFirstPayload); myFirstRenderItem = _main3DScene->allocateID(); render::Scene::PendingChanges pendingChanges; diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 685e8c1a72..a4ef798a7b 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -218,7 +218,7 @@ public: virtual const Item::Bound getBound() const { return payloadGetBound(_data); } virtual void render(RenderArgs* args) { payloadRender(_data, args); } - Payload(DataPointer& data) : _data(data) {} + Payload(const DataPointer& data) : _data(data) {} protected: DataPointer _data; };