diff options
Diffstat (limited to 'source/blender/collada/MeshImporter.cpp')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index a4bf1d28366..02e78b9bc45 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()); @@ -820,7 +818,7 @@ void MeshImporter::bmeshConversion() Mesh *me = (*m).second; BKE_mesh_tessface_clear(me); BKE_mesh_calc_normals(me); - //BKE_mesh_validate(me, 1); + /* BKE_mesh_validate(me, true, true); */ } } } @@ -1063,7 +1061,7 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri // set texture face if (color_texture && strlen((color_texture)->uvname) && - strcmp(layername, color_texture->uvname) != 0) { + !STREQ(layername, color_texture->uvname)) { texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, CD_MTFACE, color_texture->uvname); strcpy(layername, color_texture->uvname); |