diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-10 23:22:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-10 23:30:11 +0300 |
commit | 1d64dff6716ac02fb706d4111c606ddc42984a3d (patch) | |
tree | db99bb13bc92677e2a3a8aceb954f9be3f0f1b25 | |
parent | 2b01b713394ae49bb805c889b65719ac59827b89 (diff) |
Fix recent vert-slide UV's when cancelled
Added support recently, but wasn't cancelling correctly.
-rw-r--r-- | source/blender/editors/transform/transform.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 14bbdebd138..2cf8031e439 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2342,8 +2342,12 @@ int transformEnd(bContext *C, TransInfo *t) /* handle restoring objects */ if (t->state == TRANS_CANCEL) { /* exception, edge slide transformed UVs too */ - if (t->mode == TFM_EDGE_SLIDE) + if (t->mode == TFM_EDGE_SLIDE) { doEdgeSlide(t, 0.0f); + } + else if (t->mode == TFM_VERT_SLIDE) { + doVertSlide(t, 0.0f); + } exit_code = OPERATOR_CANCELLED; restoreTransObjects(t); // calls recalcData() diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5deb5ee9635..4802f8dc127 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5615,6 +5615,12 @@ void special_aftertrans_update(bContext *C, TransInfo *t) sld->perc = 0.0; projectEdgeSlideData(t, false); } + else if (t->mode == TFM_VERT_SLIDE) { + VertSlideData *sld = t->customData; + + sld->perc = 0.0; + projectVertSlideData(t, false); + } } } } |