diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-23 17:59:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-23 17:59:09 +0300 |
commit | 6d78936c43741b74f1226af9c096d7253f8fb266 (patch) | |
tree | 61d95ce39f24f0428a3e0d89d483c93300c692fb /source/blender/collada | |
parent | e40387b1e2af2b2810b2062b1c68491c22911505 (diff) |
cleanup: style
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/EffectExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 3c35618a4cd..1f0e00b3bd6 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -387,7 +387,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob) std::set<Image *>::iterator uv_t_iter; int idx; for (idx = 0, uv_t_iter = uv_textures.begin(); uv_t_iter != uv_textures.end(); uv_t_iter++, idx++ ) { - if(active_uv_layer>-1 && idx==active_uv_layer) { + if (active_uv_layer>-1 && idx==active_uv_layer) { Image *ima = *uv_t_iter; std::string key(id_name(ima)); key = translate_id(key); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index a4bf1d28366..571faf8c2e9 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -227,8 +227,7 @@ void MeshImporter::set_vcol(MLoopCol *mlc, VCOLDataWrapper &vob, int loop_index, { COLLADAFW::UIntValuesArray& indices =index_list.getIndices(); int index; - for(index = 0; index < count; index++,mlc++) - { + for (index = 0; index < count; index++, mlc++) { int v_index = indices[index+loop_index]; vob.get_vcol(v_index,mlc); } @@ -708,8 +707,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me) mpoly->flag |= ME_SMOOTH; } - for(unsigned int vcolor_index = 0 ; vcolor_index < index_list_array_vcolor.getCount();vcolor_index++) - { + for (unsigned int vcolor_index = 0 ; vcolor_index < index_list_array_vcolor.getCount();vcolor_index++) { COLLADAFW::IndexList& index_list = *index_list_array_vcolor[vcolor_index]; COLLADAFW::String colname = extract_vcolname(index_list.getName()); MLoopCol *mloopcol = (MLoopCol *)CustomData_get_layer_named(&me->ldata, CD_MLOOPCOL, colname.c_str()); |