[dali_1.1.10] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-item.cpp

diff --git a/dali/internal/render/common/render-item.cpp b/dali/internal/render/common/render-item.cpp
index a082149..a177ee4 100644 (file)
--- a/dali/internal/render/common/render-item.cpp
+++ b/dali/internal/render/common/render-item.cpp
@@ -19,7 +19,7 @@
 #include <dali/internal/render/common/render-item.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/render/renderers/scene-graph-renderer.h>
+#include <dali/internal/render/renderers/render-renderer.h>
 
 namespace Dali
 {
@@ -33,8 +33,9 @@ namespace SceneGraph
 RenderItem::RenderItem()
 : mModelViewMatrix( false ),
   mRenderer( NULL ),
-  mDepthIndex(0),
-  mIsOpaque(true)
+  mNode( NULL ),
+  mDepthIndex( 0 ),
+  mIsOpaque( true )
 {
 }
 
@@ -47,14 +48,19 @@ void RenderItem::Reset()
   mRenderer = NULL;
 }
 
-void RenderItem::SetRenderer( Renderer* renderer )
+void RenderItem::SetRenderer( Render::Renderer* renderer )
 {
   mRenderer = renderer;
 }
 
-const Renderer* RenderItem::GetRenderer() const
+void RenderItem::SetNode( Node* node )
 {
-  return mRenderer;
+  mNode = node;
+}
+
+Render::Renderer& RenderItem::GetRenderer() const
+{
+  return *mRenderer;
 }
 
 Matrix& RenderItem::GetModelViewMatrix()