diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-27 22:29:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-27 22:29:47 +0400 |
commit | 32478997ec1fac6b155ffc1442312c4c33fd53df (patch) | |
tree | e5a2d8cbe02b24d14807ea18cc1ac8f6f26ade43 /source/blender/collada | |
parent | 25a018fad09907acfbd12580e75b3091b4ef7080 (diff) |
style cleanup
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 9 | ||||
-rw-r--r-- | source/blender/collada/SceneExporter.cpp | 6 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 59927e961bf..ded937bf8f3 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -294,8 +294,7 @@ bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh) // checks if mesh has su } - else if (type == COLLADAFW::MeshPrimitive::LINES) - { + else if (type == COLLADAFW::MeshPrimitive::LINES) { // TODO: Add Checker for line syntax here } @@ -582,8 +581,7 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me) COLLADAFW::MeshPrimitive *mp = prim_arr[i]; int type = mp->getPrimitiveType(); - if (type == COLLADAFW::MeshPrimitive::LINES) - { + if (type == COLLADAFW::MeshPrimitive::LINES) { unsigned int edge_count = mp->getFaceCount(); unsigned int *indices = mp->getPositionIndices().getData(); @@ -857,8 +855,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T indices += vcount; } } - else if (type == COLLADAFW::MeshPrimitive::LINES) - { + else if (type == COLLADAFW::MeshPrimitive::LINES) { continue; // read the lines later after all the rest is done } diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp index 65f552d5d0c..4aaff024cac 100644 --- a/source/blender/collada/SceneExporter.cpp +++ b/source/blender/collada/SceneExporter.cpp @@ -57,8 +57,7 @@ void SceneExporter::exportHierarchy(Scene *sce) // Now find all exportable base ojects (highest in export hierarchy) for (node = this->export_settings->export_set; node; node = node->next) { Object *ob = (Object *) node->link; - if (bc_is_base_node(this->export_settings->export_set, ob)) - { + if (bc_is_base_node(this->export_settings->export_set, ob)) { switch (ob->type) { case OB_MESH: case OB_CAMERA: @@ -86,8 +85,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce) // Add associated armature first if available bool armature_exported = false; Object *ob_arm = bc_get_assigned_armature(ob); - if (ob_arm != NULL) - { + if (ob_arm != NULL) { armature_exported = bc_is_in_Export_set(this->export_settings->export_set, ob_arm); if (armature_exported && bc_is_marked(ob_arm)) { bc_remove_mark(ob_arm); diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index cb9da9918be..955d699d96c 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -187,8 +187,7 @@ Object *bc_get_assigned_armature(Object *ob) Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob) { Object *ancestor = ob; - while (ob->parent && bc_is_marked(ob->parent)) - { + while (ob->parent && bc_is_marked(ob->parent)) { ob = ob->parent; ancestor = ob; } |