diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
| commit | ddae05cdca9211a789a6501c6ca054f9a46e07c5 (patch) | |
| tree | e7591dd7c31ccfb6c25beb0bca7bf670a788cd35 /source/blender/collada/MeshImporter.cpp | |
| parent | 7ecc7c46af493f984e9cb2f08ac75da5b30ffd35 (diff) | |
| parent | 2c9c22df26dfdcf03bb308fdf35294ed79c2d0e5 (diff) | |
Merge remote-tracking branch 'origin' into blender2.8
Diffstat (limited to 'source/blender/collada/MeshImporter.cpp')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index f8cd487c355..ec1b14a3855 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -554,7 +554,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len) { CustomData edata; MEdge *medge; - int i, totedge; + int totedge; if (len == 0) return; @@ -574,7 +574,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len) /* set default flags */ medge = &mesh->medge[mesh->totedge]; - for (i = 0; i < len; i++, medge++) + for (int i = 0; i < len; i++, medge++) medge->flag = ME_EDGEDRAW | ME_EDGERENDER | SELECT; mesh->totedge = totedge; @@ -608,12 +608,12 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me) unsigned int edge_count = mp->getFaceCount(); unsigned int *indices = mp->getPositionIndices().getData(); - for (int i = 0; i < edge_count; i++, med++) { + for (int j = 0; j < edge_count; j++, med++) { med->bweight = 0; med->crease = 0; med->flag |= ME_LOOSEEDGE; - med->v1 = indices[2 * i]; - med->v2 = indices[2 * i + 1]; + med->v1 = indices[2 * j]; + med->v2 = indices[2 * j + 1]; } } } |