diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-29 15:33:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-29 16:39:50 +0300 |
| commit | 6d0cae56e84306ed64a51005c4fb1811a40822b7 (patch) | |
| tree | de25f4c347865a2aefe7d33b8ab5920d35718254 /source/blender/editors/mesh/meshtools.c | |
| parent | b5ce2bbef7a91f81c3556f2ddf6dd5f21161bc91 (diff) | |
Fix T48290: Hook fails after deleting geometry
Now CD_SHAPEKEY_INDEX customdata is stored in edit-mode when hooks and vertex parents are used.
This also fixes a bug where undo would loose key-index data.
Move to structs for BM_mesh_bm_to/from_me to avoid passing many argument, which mostly aren't used.
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 bad835b13e7..90676d2b951 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -572,7 +572,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, ob); + EDBM_mesh_make(scene->toolsettings, ob, false); EDBM_mesh_load(ob); EDBM_mesh_free(me->edit_btmesh); MEM_freeN(me->edit_btmesh); |