diff options
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 15 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 6 | ||||
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 3 | ||||
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 3 |
4 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 5b1ad604b50..d6eb406ced7 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -548,7 +548,8 @@ void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNa if ( transform ) { param.push_back("TRANSFORM"); - }else{ //assumes if axis isn't specified all axises are added + } + else { //assumes if axis isn't specified all axises are added param.push_back("X"); param.push_back("Y"); param.push_back("Z"); @@ -592,7 +593,8 @@ void AnimationExporter::get_source_values(BezTriple *bezt, COLLADASW::InputSeman } else if (rotation) { values[1] = RAD2DEGF(bezt->vec[0][1]); - } else { + } + else { values[1] = bezt->vec[0][1]; } break; @@ -607,7 +609,8 @@ void AnimationExporter::get_source_values(BezTriple *bezt, COLLADASW::InputSeman } else if (rotation) { values[1] = RAD2DEGF(bezt->vec[2][1]); - } else { + } + else { values[1] = bezt->vec[2][1]; } break; @@ -858,9 +861,11 @@ std::string AnimationExporter::create_interpolation_source(FCurve *fcu, const st if (fcu->bezt[i].ipo==BEZT_IPO_BEZ) { source.appendValues(BEZIER_NAME); *has_tangents = true; - } else if (fcu->bezt[i].ipo==BEZT_IPO_CONST) { + } + else if (fcu->bezt[i].ipo==BEZT_IPO_CONST) { source.appendValues(STEP_NAME); - } else { // BEZT_IPO_LIN + } + else { // BEZT_IPO_LIN source.appendValues(LINEAR_NAME); } } diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index b85e9e2fd01..4ad79e0b309 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1015,9 +1015,11 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light ) else if(IS_EQ(quadatt, 0.0f) && linatt > 0.0f) { att1 = linatt; d = (1.0f/linatt); - } else if (IS_EQ(constatt, 1.0f)) { + } + else if (IS_EQ(constatt, 1.0f)) { att1 = 1.0f; - } else { + } + else { // assuming point light (const att = 1.0); att1 = 1.0f; } diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 7ada149cde9..0dbd44f2b73 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -138,7 +138,8 @@ void EffectsExporter::operator()(Material *ma, Object *ob) // for now set phong in case spec shader is not blinn writePhong(ep, ma); } - } else { + } + else { if(ma->diff_shader == MA_DIFF_LAMBERT) { writeLambert(ep, ma); } diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 10fae7e2c1b..2539756dbdf 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -917,7 +917,8 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta texture_face = assign_material_to_geom(mat_array[i], uid_material_map, ob, geom_uid, &color_texture, layername, texture_face, material_texture_mapping_map, i); - } else { + } + else { fprintf(stderr, "invalid referenced material for %s\n", mat_array[i].getName().c_str()); } } |