diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-15 18:01:39 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-15 18:01:39 +0300 |
commit | 237cd7a7a747334109a742c89dd0a78d4bb35d47 (patch) | |
tree | 2a0eb0772be8900d679f31969566478d7a75d791 /source/blender/editors/mesh/editmesh_tools.c | |
parent | c54cad0a32e044205891ee08a0bac44c655f6020 (diff) |
2.5
- Depricated another bunch of globals; all the totobj,
totmesh, totvert, and so on.
- All code that needs such totals now count it themselves,
these stats were not supposed to be reliable
- Editmesh now stores and manages own totals.
- Todo: make a scene->stats that tracks notifiers.
Bugfix: selecting failed in editmesh, backbuffer stuff was
too late, already using index ranges before it was set.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 4257480d96d..396e9ac8437 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -592,28 +592,28 @@ void extrude_mesh(Object *obedit, EditMesh *em) short nr, transmode= 0; if(em->selectmode & SCE_SELECT_VERTEX) { - if(G.totvertsel==0) nr= 0; - else if(G.totvertsel==1) nr= 4; - else if(G.totedgesel==0) nr= 4; - else if(G.totfacesel==0) + if(em->totvertsel==0) nr= 0; + else if(em->totvertsel==1) nr= 4; + else if(em->totedgesel==0) nr= 4; + else if(em->totfacesel==0) nr= pupmenu("Extrude %t|Only Edges%x3|Only Vertices%x4"); - else if(G.totfacesel==1) + else if(em->totfacesel==1) nr= pupmenu("Extrude %t|Region %x1|Only Edges%x3|Only Vertices%x4"); else nr= pupmenu("Extrude %t|Region %x1||Individual Faces %x2|Only Edges%x3|Only Vertices%x4"); } else if(em->selectmode & SCE_SELECT_EDGE) { - if (G.totedgesel==0) nr = 0; - else if (G.totedgesel==1) nr = 3; - else if(G.totfacesel==0) nr = 3; - else if(G.totfacesel==1) + if (em->totedgesel==0) nr = 0; + else if (em->totedgesel==1) nr = 3; + else if(em->totfacesel==0) nr = 3; + else if(em->totfacesel==1) nr= pupmenu("Extrude %t|Region %x1|Only Edges%x3"); else nr= pupmenu("Extrude %t|Region %x1||Individual Faces %x2|Only Edges%x3"); } else { - if (G.totfacesel == 0) nr = 0; - else if (G.totfacesel == 1) nr = 1; + if (em->totfacesel == 0) nr = 0; + else if (em->totfacesel == 1) nr = 1; else nr= pupmenu("Extrude %t|Region %x1||Individual Faces %x2"); } @@ -5839,7 +5839,7 @@ void region_to_loop(EditMesh *em) EditEdge *eed; EditFace *efa; - if(G.totfacesel){ + if(em->totfacesel){ for(eed=em->edges.first; eed; eed=eed->next) eed->f1 = 0; for(efa=em->faces.first; efa; efa=efa->next){ |