Merge "Do not change BlendMode by following whether advanced blend equation is appied...

diff --git a/automated-tests/scripts/retriever.sh b/automated-tests/scripts/retriever.sh
index 102bb44..ea75c43 100755 (executable)
--- a/automated-tests/scripts/retriever.sh
+++ b/automated-tests/scripts/retriever.sh
@@ -29,9 +29,12 @@ function get_tc_files {
         flag = 1;
         next;
     }
+    /LIST\(APPEND TC_SOURCES/ {
+        flag = 1;
+        next;
+    }
     /\)/ {
-        if (flag == 1)
-            exit;
+        flag = 0;
     }
     !/^ *#/ {
         if (flag == 1) {

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index 9182c1f..4e7dff9 100755 (executable)
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -1217,13 +1217,21 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES:
       {
-        value.Get( controlImpl.mImpl->mAccessibilityAttributes );
+        const Property::Map* map = value.GetMap();
+        if( map && !map->Empty() )
+        {
+          controlImpl.mImpl->mAccessibilityAttributes = *map;
+        }
         break;
       }
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ANIMATED:
       {
-        value.Get( controlImpl.mImpl->mAccessibilityAnimated );
+        bool animated;
+        if( value.Get( animated ) )
+        {
+          controlImpl.mImpl->mAccessibilityAnimated = animated;
+        }
         break;
       }
     }

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 8f76009..9fa27ae 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 2;
+const unsigned int TOOLKIT_MICRO_VERSION = 3;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 45a81e7..fd08b0b 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.0.2
+Version:    2.0.3
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT