diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-22 14:44:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-22 14:44:24 +0400 |
| commit | 9634f8f1151740609230c24761ac20fdfe1a9168 (patch) | |
| tree | 201b9b684a779a00a5ae58a7b89cdfc042c254b8 /source/blender/editors/mesh/meshtools.c | |
| parent | e8b02626f2a52a7e6d032e0e63a5321100bc2bf6 (diff) | |
transform was flushing the selection (inline), now skip this and use the selection as-is.
flush the selection on entering editmode instead (since the selection mode can be changed with another mesh).
is other tools leave the selection incorrectly flushed, those will need to be fixed so transform works as expected.
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index d0adfc20f79..ed05d2a01a5 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -570,7 +570,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); #else /* toggle editmode using lower level functions so this can be called from python */ - EDBM_mesh_make(scene->toolsettings, scene, ob); + EDBM_mesh_make(scene->toolsettings, ob); EDBM_mesh_load(ob); EDBM_mesh_free(me->edit_btmesh); MEM_freeN(me->edit_btmesh); |