diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-16 13:16:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-16 13:16:24 +0400 |
commit | 664c95d1ebf525b6daf15dc599c85f14ab58155d (patch) | |
tree | 777f806b955e7494fafe6db9265617c41cb822d0 /source/blender/collada/collada_utils.cpp | |
parent | 9f6a66d5f9feb34377cf0e6465020cc80f673d8e (diff) |
code cleanup: collada
- when bubble sorting names - dont convert to str::string just to compare strings
- use BLI_linklist_index() to check if an item is in the list
- quiet some warnings
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 041ffd48f9d..0d17c89ea30 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -193,30 +193,19 @@ bool bc_is_base_node(LinkNode *export_set, Object *ob) bool bc_is_in_Export_set(LinkNode *export_set, Object *ob) { - LinkNode *node = export_set; - - while (node) { - Object *element = (Object *)node->link; - - if (element == ob) - return true; - - node= node->next; - } - return false; + return (BLI_linklist_index(export_set, ob) != -1); } bool bc_has_object_type(LinkNode *export_set, short obtype) { - LinkNode *node = export_set; + LinkNode *node; - while (node) { + for (node = export_set; node; node = node->next) { Object *ob = (Object *)node->link; - + /* XXX - why is this checking for ob->data? - we could be looking for empties */ if (ob->type == obtype && ob->data) { return true; } - node= node->next; } return false; } @@ -236,19 +225,16 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set) { bool sorted = false; LinkNode *node; - for(node=export_set; node->next && !sorted; node=node->next) { + for (node = export_set; node->next && !sorted; node = node->next) { sorted = true; LinkNode *current; - for (current=export_set; current->next; current = current->next) { + for (current = export_set; current->next; current = current->next) { Object *a = (Object *)current->link; Object *b = (Object *)current->next->link; - std::string str_a (a->id.name); - std::string str_b (b->id.name); - - if (str_a.compare(str_b) > 0) { + if (strcmp(a->id.name, b->id.name) > 0) { current->link = b; current->next->link = a; sorted = false; @@ -264,7 +250,7 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set) * are root bones. */ bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) { - if(deform_bones_only) { + if (deform_bones_only) { Bone *root = NULL; Bone *bone = aBone; while (bone) { @@ -272,7 +258,7 @@ bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) { root = bone; bone = bone->parent; } - return aBone==root; + return (aBone == root); } else return !(aBone->parent); |