diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:08:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:08:27 +0300 |
commit | 85de548e03fcaf657356382286a7ca6d6fbd30f3 (patch) | |
tree | c80b051a63446fcbe49df02ffc6af00c2405a48b /source/blender/collada | |
parent | 141f0f4c4717a8f6090515779de10e205455644b (diff) |
Cleanup: indentation
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 18 | ||||
-rw-r--r-- | source/blender/collada/EffectExporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/InstanceWriter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/MaterialExporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 24 |
7 files changed, 37 insertions, 30 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 334dff20d52..0631ab42319 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -566,14 +566,16 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation * } case COLLADAFW::Transformation::MATRIX: - /*{ - COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform; - COLLADABU::Math::Matrix4 mat4 = mat->getMatrix(); - switch (binding->animationClass) { - case COLLADAFW::AnimationList::TRANSFORM: - - } - }*/ +#if 0 + { + COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform; + COLLADABU::Math::Matrix4 mat4 = mat->getMatrix(); + switch (binding->animationClass) { + case COLLADAFW::AnimationList::TRANSFORM: + + } + } +#endif unused_fcurve(curves); break; case COLLADAFW::Transformation::SKEW: diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 2bf0859b0f0..de92a7f2cc2 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -91,8 +91,9 @@ void EffectsExporter::exportEffects(Scene *sce) openLibrary(); std::set<Image *>::iterator uv_images_iter; for (uv_images_iter = uv_images.begin(); - uv_images_iter != uv_images.end(); - uv_images_iter++) { + uv_images_iter != uv_images.end(); + uv_images_iter++) + { Image *ima = *uv_images_iter; std::string key(id_name(ima)); diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index bc0275001d3..8406426a366 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -490,8 +490,9 @@ void GeometryExporter::createPolylists(std::set<Image *> uv_images, { std::set<Image *>::iterator uv_images_iter; for (uv_images_iter = uv_images.begin(); - uv_images_iter != uv_images.end(); - uv_images_iter++) { + uv_images_iter != uv_images.end(); + uv_images_iter++) + { Image *ima = *uv_images_iter; std::string imageid(id_name(ima)); diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp index de1a4075462..4d846693e50 100644 --- a/source/blender/collada/InstanceWriter.cpp +++ b/source/blender/collada/InstanceWriter.cpp @@ -51,8 +51,9 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia std::set<Image *> uv_images = bc_getUVImages(ob, all_uv_layers); std::set<Image *>::iterator uv_images_iter; for (uv_images_iter = uv_images.begin(); - uv_images_iter != uv_images.end(); - uv_images_iter++) { + uv_images_iter != uv_images.end(); + uv_images_iter++) + { Image *ima = *uv_images_iter; std::string matid(id_name(ima)); matid = get_material_id_from_id(matid); diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index 6e6cc24be20..0c0395f2a21 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -56,8 +56,9 @@ void MaterialsExporter::exportMaterials(Scene *sce) openLibrary(); std::set<Image *>::iterator uv_images_iter; for (uv_images_iter = uv_images.begin(); - uv_images_iter != uv_images.end(); - uv_images_iter++) { + uv_images_iter != uv_images.end(); + uv_images_iter++) + { Image *ima = *uv_images_iter; std::string matid(id_name(ima)); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 2e265125a43..f0dadf8cbc7 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -703,8 +703,9 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me) } if (collada_meshtype == COLLADAFW::MeshPrimitive::POLYLIST || - collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS || - collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES) { + collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS || + collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES) + { COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp; unsigned int start_index = 0; diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index fcd92e220c0..8c4ddd67d07 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -755,17 +755,17 @@ float bc_get_property(Bone *bone, std::string key, float def) IDProperty *property = bc_get_IDProperty(bone, key); if (property) { switch (property->type) { - case IDP_INT: - result = (float)(IDP_Int(property)); - break; - case IDP_FLOAT: - result = (float)(IDP_Float(property)); - break; - case IDP_DOUBLE: - result = (float)(IDP_Double(property)); - break; - default: - result = def; + case IDP_INT: + result = (float)(IDP_Int(property)); + break; + case IDP_FLOAT: + result = (float)(IDP_Float(property)); + break; + case IDP_DOUBLE: + result = (float)(IDP_Double(property)); + break; + default: + result = def; } } return result; @@ -1066,4 +1066,4 @@ std::set<Image *> bc_getUVImages(Object *ob, bool all_uv_layers) } } return UVImages; -}
\ No newline at end of file +} |