diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-14 12:14:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-14 12:14:50 +0400 |
commit | 723eaa36ceea6c5305fb57473ae5e38d8b34249d (patch) | |
tree | 6dfd12c1df7ff79ab44219ebf23b315fe69a9f95 /source | |
parent | 2f5e10f7b81ed2e270be8a21ccf356311caabd51 (diff) |
fix own error in BM_mesh_calc_edge_groups() was clearning wrong dirty-index flag.
also remove unused transform defines.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 18 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 |
4 files changed, 10 insertions, 22 deletions
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 0eb3b0a6443..6eab3c625fa 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -1986,7 +1986,7 @@ int BM_mesh_calc_edge_groups(BMesh *bm, int *r_groups_array, int (**r_group_inde BM_elem_index_set(e, i); /* set_inline */ } - bm->elem_index_dirty &= ~BM_FACE; + bm->elem_index_dirty &= ~BM_EDGE; /* detect groups */ stack = MEM_mallocN(sizeof(*stack) * tot_edges, __func__); diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 423613fb780..81308dd84f2 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -90,16 +90,14 @@ enum TfmMode { /* TRANSFORM CONTEXTS */ #define CTX_NONE 0 -#define CTX_TEXTURE 1 -#define CTX_EDGE 2 -#define CTX_NO_PET 4 -#define CTX_TWEAK 8 -#define CTX_NO_MIRROR 16 -#define CTX_AUTOCONFIRM 32 -#define CTX_BMESH 64 -#define CTX_NDOF 128 -#define CTX_MOVIECLIP 256 -#define CTX_MASK 512 +#define CTX_TEXTURE (1 << 0) +#define CTX_EDGE (1 << 1) +#define CTX_NO_PET (1 << 2) +#define CTX_NO_MIRROR (1 << 3) +#define CTX_AUTOCONFIRM (1 << 4) +#define CTX_NDOF (1 << 5) +#define CTX_MOVIECLIP (1 << 6) +#define CTX_MASK (1 << 7) /* Standalone call to get the transformation center corresponding to the current situation * returns 1 if successful, 0 otherwise (usually means there's no selection) diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index ed466186d63..d5a9d0f9f93 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1324,12 +1324,6 @@ int transformEvent(TransInfo *t, const wmEvent *event) t->redraw |= TREDRAW_HARD; } break; -// case LEFTMOUSE: -// case RIGHTMOUSE: -// if (WM_modal_tweak_exit(event, t->event_type)) -//// if (t->options & CTX_TWEAK) -// t->state = TRANS_CONFIRM; -// break; case LEFTALTKEY: case RIGHTALTKEY: if (ELEM(t->spacetype, SPACE_SEQ, SPACE_VIEW3D)) { @@ -1374,7 +1368,7 @@ int calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], int c t->state = TRANS_RUNNING; /* avoid calculating PET */ - t->options = CTX_NONE | CTX_NO_PET; + t->options = CTX_NO_PET; t->mode = TFM_DUMMY; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index cb2cb801b50..95ec20a0c2b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6668,10 +6668,6 @@ void createTransData(bContext *C, TransInfo *t) sort_trans_data_dist(t); } } - else if (t->options == CTX_BMESH) { - // TRANSFORM_FIX_ME - //createTransBMeshVerts(t, G.editBMesh->bm, G.editBMesh->td); - } else if (t->spacetype == SPACE_IMAGE) { t->flag |= T_POINTS | T_2D_EDIT; if (t->options & CTX_MASK) { |