[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42502] branches/bmesh/blender/source/ blender/bmesh: replace function in commented code incase we want to bring it back

[Campbell Barton]

Revision: 42502
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42502
Author:   campbellbarton
Date:     2011-12-07 21:55:59 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
replace function in commented code incase we want to bring it back

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
    branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c     
2011-12-07 21:54:14 UTC (rev 42501)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c     
2011-12-07 21:55:59 UTC (rev 42502)
@@ -230,7 +230,7 @@
                                }
                        };
                }
-               BM_Collapse_Vert(bm, v->e, v, 1.0);
+               BM_Collapse_Vert_Faces(bm, v->e, v, 1.0);
        }
 }
 #endif

Modified: branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c       
2011-12-07 21:54:14 UTC (rev 42501)
+++ branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c       
2011-12-07 21:55:59 UTC (rev 42502)
@@ -436,9 +436,9 @@
        if (res) {
                bmesh_jekv;
 
-               //void BM_Collapse_Vert(BMesh *bm, BMEdge *ke, BMVert *kv, 
float fac, int calcnorm){
+               //void BM_Collapse_Vert_Faces(BMesh *bm, BMEdge *ke, BMVert 
*kv, float fac, int calcnorm){
                //hrm, why is there a fac here? it just removes a vert
-               BM_Collapse_Vert(bm, v->e, v, 1.0, 0);
+               BM_Collapse_Vert_Faces(bm, v->e, v, 1.0, 0);
                //bmesh_jekv(bm,v->e,v);
        }
 
@@ -486,14 +486,14 @@
                if (kl->v == kv) {
                        
BM_Split_Face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
                        bmesh_jfke(bm, 
kl->prev->radial_next->f,kl->f,kl->prev->e);
-                       BM_Collapse_Vert(bm, kl->e, kv, 1.0);
+                       BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0);
                        //BME_JEKV(bm,kl->e,kv);
                        
                }
                else {
                        
BM_Split_Face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
                        bmesh_jfke(bm, 
kl->next->radial_next->f,kl->f,kl->next->e);
-                       BM_Collapse_Vert(bm, kl->e, kv, 1.0);
+                       BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0);
                        //BME_JEKV(bm,kl->e,kv);
                }
                l = l->prev;
@@ -523,13 +523,13 @@
                if (kl->v == kv) {
                        
BM_Split_Face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
                        
bmesh_jfke(bm,kl->prev->radial_next->f,kl->f,kl->prev->e);
-                       BM_Collapse_Vert(bm, kl->e, kv, 1.0);
+                       BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0);
                        //BME_JEKV(bm,kl->e,kv);
                }
                else {
                        
BM_Split_Face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
                        bmesh_jfke(bm, 
kl->next->radial_next->f,kl->f,kl->next->e);
-                       BM_Collapse_Vert(bm, kl->e, kv, 1.0);
+                       BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0);
                        //BME_JEKV(bm,kl->e,kv);
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs