Merge "Fixed the case when the new program is not set whe GLES Context Flush() is...

diff --git a/dali/internal/canvas-renderer/common/drawable-group-impl.cpp b/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
index 01109ae..53ec50e 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
+++ b/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
@@ -40,7 +40,7 @@ bool DrawableGroup::Clear()
 
 DrawableGroup::DrawableVector DrawableGroup::GetDrawables() const
 {
-  return DrawableVector();
+  return DrawableGroup::DrawableVector();
 }
 
 } // namespace Adaptor

diff --git a/dali/internal/canvas-renderer/common/drawable-group-impl.h b/dali/internal/canvas-renderer/common/drawable-group-impl.h
index 4e56e87..cfd62a2 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-impl.h
+++ b/dali/internal/canvas-renderer/common/drawable-group-impl.h
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
+#include <vector>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>