diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:13:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:13:48 +0300 |
| commit | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (patch) | |
| tree | ce52b7a9a8941912152cc3bf7d07fb2a429b5d0d /source/blender/collada | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Cleanup: indentation
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 3 | ||||
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 13 | ||||
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 0631ab42319..226f8309ffb 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1753,7 +1753,8 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float if (type != COLLADAFW::Transformation::ROTATE && type != COLLADAFW::Transformation::SCALE && type != COLLADAFW::Transformation::TRANSLATE && - type != COLLADAFW::Transformation::MATRIX) { + type != COLLADAFW::Transformation::MATRIX) + { fprintf(stderr, "animation of transformation %d is not supported yet\n", type); return false; } diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index de92a7f2cc2..a4764cab67e 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -149,12 +149,13 @@ void EffectsExporter::writePhong(COLLADASW::EffectProfile &ep, Material *ma) ep.setSpecular(cot, false, "specular"); } -void EffectsExporter::writeTextures(COLLADASW::EffectProfile &ep, - std::string &key, - COLLADASW::Sampler *sampler, - MTex *t, Image *ima, - std::string &uvname ) { - +void EffectsExporter::writeTextures( + COLLADASW::EffectProfile &ep, + std::string &key, + COLLADASW::Sampler *sampler, + MTex *t, Image *ima, + std::string &uvname ) +{ // Image not set for texture if (!ima) return; diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index f0dadf8cbc7..9848bf3b50b 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1093,7 +1093,8 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri // set texture face if (color_texture && strlen((color_texture)->uvname) && - !STREQ(layername, color_texture->uvname)) { + !STREQ(layername, color_texture->uvname)) + { texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, CD_MTFACE, color_texture->uvname); strcpy(layername, color_texture->uvname); |