[Bf-blender-cvs] [1d64dff] master: Fix recent vert-slide UV's when cancelled

[Campbell Barton]

Commit: 1d64dff6716ac02fb706d4111c606ddc42984a3d
Author: Campbell Barton
Date:   Wed Feb 11 07:22:19 2015 +1100
Branches: master
https://developer.blender.org/rB1d64dff6716ac02fb706d4111c606ddc42984a3d

Fix recent vert-slide UV's when cancelled

Added support recently, but wasn't cancelling correctly.

===================================================================

M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_conversions.c

===================================================================

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 14bbdeb..2cf8031 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 5deb5ee..4802f8d 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);
+				}
 			}
 		}
 	}