From aa8488421f230bf4b4f6e84370085ad465a6f2b3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 21 Sep 2013 10:46:58 +0000 Subject: style cleanup: whitespace & odd indentation --- source/blender/collada/DocumentImporter.cpp | 2 +- source/blender/collada/MeshImporter.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 5592be6e872..79c725166f6 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -944,7 +944,7 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera) return true; } - if(et && et->isProfile("blender")) { + if (et && et->isProfile("blender")) { et->setData("shiftx",&(cam->shiftx)); et->setData("shifty",&(cam->shifty)); et->setData("YF_dofdist",&(cam->YF_dofdist)); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 09d71f22a0d..c7652bd7ae7 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -665,9 +665,10 @@ void MeshImporter::get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i, v[0] = (*values)[i++]; v[1] = (*values)[i++]; - if(stride>=3) { + if (stride>=3) { v[2] = (*values)[i]; - } else { + } + else { v[2] = 0.0f; } @@ -680,9 +681,10 @@ void MeshImporter::get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i, v[0] = (float)(*values)[i++]; v[1] = (float)(*values)[i++]; - if(stride>=3) { + if (stride >= 3) { v[2] = (float)(*values)[i]; - } else { + } + else { v[2] = 0.0f; } } -- cgit v1.2.3