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/transform/transform_orientations.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/transform/transform_orientations.c')
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index bd0a97240a0..4605baa18f6 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -480,7 +480,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac } else { - if (G.totfacesel >= 1) + if (em->totfacesel >= 1) { EditFace *efa; @@ -496,7 +496,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac result = ORIENTATION_FACE; } - else if (G.totvertsel == 3) + else if (em->totvertsel == 3) { EditVert *v1 = NULL, *v2 = NULL, *v3 = NULL; float cotangent[3]; @@ -522,7 +522,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac } /* if there's an edge available, use that for the tangent */ - if (G.totedgesel >= 1) + if (em->totedgesel >= 1) { EditEdge *eed = NULL; @@ -536,7 +536,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac result = ORIENTATION_FACE; } - else if (G.totedgesel == 1) + else if (em->totedgesel == 1) { EditEdge *eed; @@ -551,7 +551,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac } result = ORIENTATION_EDGE; } - else if (G.totvertsel == 2) + else if (em->totvertsel == 2) { EditVert *v1 = NULL, *v2 = NULL; @@ -573,7 +573,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac } result = ORIENTATION_EDGE; } - else if (G.totvertsel == 1) + else if (em->totvertsel == 1) { for (eve = em->verts.first; eve; eve = eve->next) { @@ -584,7 +584,7 @@ int getTransformOrientation(bContext *C, float normal[3], float plane[3], int ac } result = ORIENTATION_VERT; } - else if (G.totvertsel > 3) + else if (em->totvertsel > 3) { normal[0] = normal[1] = normal[2] = 0; |