[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47906] trunk/blender/source/blender/ collada/collada_utils.cpp: Collada: cleanup sort function for

Gaia Clary gaia.clary at machinimatrix.org
Thu Jun 14 16:48:53 CEST 2012


Revision: 47906
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47906
Author:   gaiaclary
Date:     2012-06-14 14:48:52 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
Collada: cleanup sort function for

Modified Paths:
--------------
    trunk/blender/source/blender/collada/collada_utils.cpp

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2012-06-14 14:47:41 UTC (rev 47905)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2012-06-14 14:48:52 UTC (rev 47906)
@@ -230,14 +230,13 @@
 // Use bubble sort algorithm for sorting the export set
 void bc_bubble_sort_by_Object_name(LinkNode *export_set)
 {
-	int i, j; // loop indices
-	bool unsorted = true;
+	bool sorted = false;
+	LinkNode *node;
+	for(node=export_set; node->next && !sorted; node=node->next) {
 
-	LinkNode *current;
-	int set_size = BLI_linklist_length(export_set);
-	for(i = 0; (i < set_size) && unsorted; i++) {
-		unsorted = false;
+		sorted = true;
 		
+		LinkNode *current;
 		for (current=export_set; current->next; current = current->next) {
 			Object *a = (Object *)current->link;
 			Object *b = (Object *)current->next->link;
@@ -248,7 +247,7 @@
 			if (str_a.compare(str_b) > 0) {
 				current->link       = b;
 				current->next->link = a;
-				unsorted = true;
+				sorted = false;
 			}
 			
 		}




More information about the Bf-blender-cvs mailing list