Revert "[3.0] Bug fix in Transform manager, improve performance"

This reverts commit de3bf8f68abea11fa5c71271bd3a4417b5dbb1c1.

Change-Id: Iaf4341dd01029595f0b8785dd6120c0a15dc60f8

diff --git a/dali/internal/update/manager/transform-manager.cpp b/dali/internal/update/manager/transform-manager.cpp
index b289bf4..5415778 100644 (file)
--- a/dali/internal/update/manager/transform-manager.cpp
+++ b/dali/internal/update/manager/transform-manager.cpp
@@ -312,7 +312,6 @@ void TransformManager::SwapComponents( unsigned int i, unsigned int j )
   std::swap( mLocal[i], mLocal[j] );
   std::swap( mComponentDirty[i], mComponentDirty[j] );
   std::swap( mBoundingSpheres[i], mBoundingSpheres[j] );
-  std::swap( mWorld[i], mWorld[j] );
 
   mIds[ mComponentId[i] ] = i;
   mIds[ mComponentId[j] ] = j;
@@ -336,15 +335,10 @@ void TransformManager::ReorderComponents()
     }
   }
 
-  std::stable_sort( mOrderedComponents.Begin(), mOrderedComponents.End());
-  unsigned int previousIndex = 0;
-  for( size_t newIndex(0); newIndex<mComponentCount-1; ++newIndex )
+  std::sort( mOrderedComponents.Begin(), mOrderedComponents.End());
+  for( size_t i(0); i<mComponentCount-1; ++i )
   {
-    previousIndex = mIds[mOrderedComponents[newIndex].id];
-    if( previousIndex != newIndex )
-    {
-      SwapComponents( previousIndex, newIndex);
-    }
+    SwapComponents( mIds[mOrderedComponents[i].id], i);
   }
 }