[dali_2.3.7] Merge branch 'devel/master'

Change-Id: I65052566a4a22766d7397e459de99b91ab4fa391

diff --git a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
index 2f2e780..3d3eeef 100644 (file)
--- a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
@@ -889,13 +889,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_WRAP_MODE_V_get() {
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_USE_FIXED_CACHE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_ENABLE_FRAME_CACHE_get() {
   int jresult ;
   int result;
 
   {
     try {
-      result = (int)Dali::Toolkit::DevelImageVisual::Property::USE_FIXED_CACHE;
+      result = (int)Dali::Toolkit::DevelImageVisual::Property::ENABLE_FRAME_CACHE;
     } CALL_CATCH_EXCEPTION(0);
   }
 

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index fd81890..6c35def 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.3.6
+Version: 2.3.7
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT