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:
authorCampbell Barton <ideasman42@gmail.com>2013-07-19 14:40:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-19 14:40:43 +0400
commit824ec5a388ca1737418ef4f7d72f1910610a025b (patch)
treec4f60d38770847196acbd0b0f841d5eb3d04d03f /source/blender/collada
parentcbe43fd385b4023c98579bcc8608fe115512f065 (diff)
code cleanup: case & brace placement
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/MeshImporter.cpp25
-rw-r--r--source/blender/collada/TransformWriter.cpp11
-rw-r--r--source/blender/collada/collada_utils.cpp6
3 files changed, 27 insertions, 15 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index b4b37f7d0bd..1e0f0244072 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -315,7 +315,8 @@ bool MeshImporter::primitive_has_faces(COLLADAFW::MeshPrimitive *mp) {
case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
has_faces = true;
break;
}
@@ -347,8 +348,8 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
case COLLADAFW::MeshPrimitive::TRIANGLES:
case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
-
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
size_t prim_poly_count = mpvc->getFaceCount();
@@ -361,7 +362,8 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
total_loop_count += prim_loop_count;
break;
}
- default: break;
+ default:
+ break;
}
}
@@ -400,16 +402,19 @@ unsigned int MeshImporter::get_vertex_count(COLLADAFW::Polygons *mp, int index)
int result;
switch (type) {
case COLLADAFW::MeshPrimitive::TRIANGLES:
- case COLLADAFW::MeshPrimitive::TRIANGLE_FANS: {
+ case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
+ {
result = 3;
break;
}
case COLLADAFW::MeshPrimitive::POLYLIST:
- case COLLADAFW::MeshPrimitive::POLYGONS: {
+ case COLLADAFW::MeshPrimitive::POLYGONS:
+ {
result = mp->getGroupedVerticesVertexCountArray()[index];
break;
}
- default: {
+ default:
+ {
result = -1;
break;
}
@@ -427,12 +432,14 @@ unsigned int MeshImporter::get_loose_edge_count(COLLADAFW::Mesh *mesh) {
COLLADAFW::MeshPrimitive *mp = prim_arr[i];
int type = mp->getPrimitiveType();
switch (type) {
- case COLLADAFW::MeshPrimitive::LINES: {
+ case COLLADAFW::MeshPrimitive::LINES:
+ {
size_t prim_totface = mp->getFaceCount();
loose_edge_count += prim_totface;
break;
}
- default: break;
+ default:
+ break;
}
}
return loose_edge_count;
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index b088139262c..c3665a33ca4 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -107,15 +107,18 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B
converter.mat4_to_dae_double(d_obmat, f_obmat);
switch (transformation_type) {
- case BC_TRANSFORMATION_TYPE_MATRIX : {
+ case BC_TRANSFORMATION_TYPE_MATRIX:
+ {
node.addMatrix("transform",d_obmat);
break;
}
- case BC_TRANSFORMATION_TYPE_BOTH : {
+ case BC_TRANSFORMATION_TYPE_BOTH:
+ {
node.addMatrix("transform",d_obmat);
- /* intentional fall-through */
+ /* fall-through */
}
- case BC_TRANSFORMATION_TYPE_TRANSROTLOC: {
+ case BC_TRANSFORMATION_TYPE_TRANSROTLOC:
+ {
float loc[3], rot[3], scale[3];
TransformBase::decompose(f_obmat, loc, rot, NULL, scale);
add_transform(node, loc, rot, scale);
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 41f48a757c0..d4196bacf0d 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -145,11 +145,13 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
DerivedMesh *dm = NULL;
if (apply_modifiers) {
switch (export_mesh_type) {
- case BC_MESH_TYPE_VIEW: {
+ case BC_MESH_TYPE_VIEW:
+ {
dm = mesh_create_derived_view(scene, ob, mask);
break;
}
- case BC_MESH_TYPE_RENDER: {
+ case BC_MESH_TYPE_RENDER:
+ {
dm = mesh_create_derived_render(scene, ob, mask);
break;
}