svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / bmesh / operators / mesh_conv.c
index b59e89ff7d22f6937f7e6c43b1115097b76cd516..35a7511403cd73fe76c251c6bfb0db88bde7b8a5 100644 (file)
@@ -437,7 +437,6 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) {
                totface = 0;
                BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
                        EditVert *eve, *lasteve = NULL, *firsteve = NULL;
                totface = 0;
                BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
                        EditVert *eve, *lasteve = NULL, *firsteve = NULL;
-                       EditFace *efa;
                        
                        BLI_begin_edgefill();
                        i = 0;
                        
                        BLI_begin_edgefill();
                        i = 0;
@@ -458,10 +457,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) {
                        }
 
                        BLI_addfilledge(lasteve, firsteve);
                        }
 
                        BLI_addfilledge(lasteve, firsteve);
-                       BLI_edgefill(0);
-
-                       for (efa=fillfacebase.first; efa; efa=efa->next)
-                               totface++;
+                       totface += BLI_edgefill(0);
 
                        BLI_end_edgefill();
                }
 
                        BLI_end_edgefill();
                }