Merge "DALi Version 1.1.37" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / shader-impl.h

diff --git a/dali/internal/event/rendering/shader-impl.h b/dali/internal/event/rendering/shader-impl.h
index 85da4bd..d1c74f2 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.h
+++ b/dali/internal/event/rendering/shader-impl.h
@@ -25,6 +25,7 @@
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
 #include <dali/internal/event/resources/resource-ticket.h> // Dali::Internal::ResourceTicketPtr
+#include <dali/internal/common/shader-data.h> // ShaderPtr
 
 namespace Dali
 {
@@ -62,7 +63,7 @@ public:
 
   /**
    * Retrieve the scene-graph shader added by this object.
-   * @return A pointer to the shader, or NULL if no shader has been added to the scene-graph.
+   * @return A pointer to the shader.
    */
   SceneGraph::Shader* GetShaderSceneObject();
 
@@ -168,6 +169,7 @@ private: // unimplemented methods
 
 private:
   SceneGraph::Shader* mSceneObject;
+  Internal::ShaderDataPtr mShaderData;
 };
 
 } // namespace Internal