Merge "DALi Version 2.0.51" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / transition / transition-set-impl.cpp

diff --git a/dali-toolkit/internal/transition/transition-set-impl.cpp b/dali-toolkit/internal/transition/transition-set-impl.cpp
index ad7ca62..fd019b6 100644 (file)
--- a/dali-toolkit/internal/transition/transition-set-impl.cpp
+++ b/dali-toolkit/internal/transition/transition-set-impl.cpp
@@ -128,9 +128,12 @@ void TransitionSet::TransitionStart()
 
 void TransitionSet::TransitionFinished(Dali::Animation& source)
 {
-  for(auto&& transition : mTransitions)
+  // Call TransitionFinished() in reverse order.
+  // This let the first copied original properties will be return again at the final.
+  std::vector<TransitionBasePtr>::reverse_iterator riter;
+  for(riter = mTransitions.rbegin(); riter != mTransitions.rend(); riter++)
   {
-    transition->TransitionFinished();
+    (*riter)->TransitionFinished();
   }
 
   EmitFinishedSignal();