Merge branch '2.7'

Change-Id: I72499b82b0238c09486177f7c022f5d27896a2c8

1 files changed, 2 insertions, 2 deletions

diff --git a/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp b/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp
index 2dadc26..afe68d5 100644
--- a/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp
+++ b/src/runtimerender/graphobjects/Qt3DSRenderScene.cpp
@@ -65,7 +65,7 @@ SLayer *SScene::GetLastChild()
     return child;
 }
 
-bool SScene::PrepareForRender(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext,
+bool SScene::PrepareForRender(IQt3DSRenderContext &inContext,
                               const SRenderInstanceId id)
 {
     // We need to iterate through the layers in reverse order and ask them to render.
@@ -74,7 +74,7 @@ bool SScene::PrepareForRender(const QT3DSVec2 &inViewportDimensions, IQt3DSRende
 
     if (m_FirstChild) {
         wasDirty |=
-            inContext.GetRenderer().PrepareLayerForRender(*m_FirstChild, inViewportDimensions,
+            inContext.GetRenderer().PrepareLayerForRender(*m_FirstChild,
                                                           true, id);
     }
     return wasDirty;