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

[platform/core/uifw/dali-core.git] / dali / internal / render / data-providers / render-data-provider.cpp

diff --git a/dali/internal/render/data-providers/render-data-provider.cpp b/dali/internal/render/data-providers/render-data-provider.cpp
index 16555cc..b228bb5 100644 (file)
--- a/dali/internal/render/data-providers/render-data-provider.cpp
+++ b/dali/internal/render/data-providers/render-data-provider.cpp
@@ -65,14 +65,9 @@ Shader& RenderDataProvider::GetShader() const
   return *mShader;
 }
 
-void RenderDataProvider::SetSamplers( const RenderDataProvider::Samplers& samplers )
+RenderDataProvider::Textures& RenderDataProvider::GetTextures()
 {
-  mSamplers = samplers;
-}
-
-const RenderDataProvider::Samplers& RenderDataProvider::GetSamplers() const
-{
-  return mSamplers;
+  return mTextures;
 }
 
 } // SceneGraph