svn merge ^/trunk/blender -r43436:43443
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 05:25:11 +0000 (05:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 05:25:11 +0000 (05:25 +0000)
source/blender/blenkernel/intern/mesh.c

index 082e8f0a67697149e93ef81f77536e3b0a190565..805302027b262354b2a41e4e80ba292a0d02d804 100644 (file)
@@ -2483,7 +2483,7 @@ int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
                                mesh_loops_to_mface_corners(fdata, ldata, pdata,
                                                            lindex, k, i, 3,
                                                            numTex, numCol, hasWCol);
-                               test_index_face(mf, fdata, totface, 3);
+                               test_index_face(mf, fdata, k, 3);
                        }
                        else {
                                /*sort loop indices to ensure winding is correct*/
@@ -2503,7 +2503,7 @@ int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
                                mesh_loops_to_mface_corners(fdata, ldata, pdata,
                                                            lindex, k, i, 4,
                                                            numTex, numCol, hasWCol);
-                               test_index_face(mf, fdata, totface, 4);
+                               test_index_face(mf, fdata, k, 4);
                        }
 
                        mf->edcode= 0;