Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2012-06-14 18:48:52 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2012-06-14 18:48:52 +0400
commit91eed57e62f2c820a9d1b4764ff3d4c7adafd51c (patch)
tree6d971a647bd00f66d37c5c4ef04c0c728a1130c9 /source/blender/collada
parent43864f9103d726fa3c425afb87d38433a2c01ba6 (diff)
Collada: cleanup sort function for
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/collada_utils.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 3d9aa8e542d..c4e336f3bc6 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -230,14 +230,13 @@ void bc_remove_mark(Object *ob)
// 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 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set)
if (str_a.compare(str_b) > 0) {
current->link = b;
current->next->link = a;
- unsorted = true;
+ sorted = false;
}
}