2007-09-25 Ross Burton <ross@openedhand.com>

	Merge from stable.

	* clutter/clutter-group.c:
	Optimise sort_z_order.

diff --git a/ChangeLog b/ChangeLog
index 77732d9..37ab64e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-25  Ross Burton  <ross@openedhand.com>
+
+       Merge from stable.
+       
+       * clutter/clutter-group.c:
+       Optimise sort_z_order.
+
 2007-09-17  Emmanuele Bassi  <ebassi@openedhand.com>
 
        Merge from stable

diff --git a/clutter/clutter-group.c b/clutter/clutter-group.c
index 4868fef..6d56459 100644 (file)
--- a/clutter/clutter-group.c
+++ b/clutter/clutter-group.c
@@ -404,13 +404,15 @@ static gint
 sort_z_order (gconstpointer a,
               gconstpointer b)
 {
-  ClutterActor *actor_a = CLUTTER_ACTOR (a);
-  ClutterActor *actor_b = CLUTTER_ACTOR (b);
+  int depth_a, depth_b;
 
-  if (clutter_actor_get_depth (actor_a) == clutter_actor_get_depth (actor_b)) 
+  depth_a = clutter_actor_get_depth (a);
+  depth_b = clutter_actor_get_depth (b);
+
+  if (depth_a == depth_b) 
     return 0;
 
-  if (clutter_actor_get_depth (actor_a) > clutter_actor_get_depth (actor_b)) 
+  if (depth_a > depth_b)
     return 1;
 
   return -1;