diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:37 +0400 |
| commit | 28dd9c6a40859bf8d707b072174557d37240f162 (patch) | |
| tree | c5436dcea18b4e70b1c363f84d1a52bf050a8a36 /source/blender/editors/mesh/editmesh_bevel.c | |
| parent | 02fbfa5c70732e691606546ecce60fdfe3f80d9f (diff) | |
Fix #35767: transforming nodes in the node editor changed the wireframe color
of the active object in the 3D view. This was due to sharing a global G.moving
flag to indicate that transform is active, now it's only set per transform data
type so different editors don't influence each other.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_bevel.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index ed55383e8a4..6033e7ee471 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -117,7 +117,7 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal) opdata->mesh_backup = EDBM_redo_state_store(em); opdata->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ED_region_draw_mouse_line_cb, opdata->mcenter, REGION_DRAW_POST_PIXEL); - G.moving = true; + G.moving = G_TRANSFORM_EDIT; opdata->twtype = v3d->twtype; v3d->twtype = 0; } @@ -179,7 +179,7 @@ static void edbm_bevel_exit(bContext *C, wmOperator *op) EDBM_redo_state_free(&opdata->mesh_backup, NULL, false); ED_region_draw_cb_exit(ar->type, opdata->draw_handle_pixel); v3d->twtype = opdata->twtype; - G.moving = false; + G.moving = 0; } MEM_freeN(opdata); op->customdata = NULL; |