diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-02-27 20:45:48 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-02-27 20:45:48 +0400 |
| commit | d55c1d59f91a919c8d4b935136454200adb0b8e8 (patch) | |
| tree | ce36a1aff7544ca37b09432a4894e1b4fbbdd022 /source/blender/editors/transform/transform_conversions.c | |
| parent | d8403875ccc422c88e6d46090033e3e31a0da02b (diff) | |
Fix: confirming edge slide with factor 0 and automerge turned on would delete the selected edges. Caused by automerging the edges with temporary geometry used for the operation, that was getting deleted later. Now deleting the temporary geometry before automerging.
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5598d70ee70..fe4574921ca 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4873,6 +4873,11 @@ void special_aftertrans_update(bContext *C, TransInfo *t) if (t->spacetype==SPACE_VIEW3D) { if (t->obedit) { if (cancelled==0) { + /* we need to delete the temporary faces before automerging */ + if(t->mode == TFM_EDGE_SLIDE){ + SlideData *sld = t->customData; + freeSlideTempFaces(sld); + } EDBM_automerge(t->scene, t->obedit, 1); } } |