[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33199] trunk/blender/source/blender/ editors/transform/transform.c: Cancel edge slide on invalid selection.

[Martin Poirier]

Revision: 33199
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33199
Author:   theeth
Date:     2010-11-20 19:46:36 +0100 (Sat, 20 Nov 2010)

Log Message:
-----------
Cancel edge slide on invalid selection.

Patch by Shane Ambler

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2010-11-20 17:31:59 UTC (rev 33198)
+++ trunk/blender/source/blender/editors/transform/transform.c	2010-11-20 18:46:36 UTC (rev 33199)
@@ -1631,6 +1631,11 @@
 		break;
 	case TFM_EDGE_SLIDE:
 		initEdgeSlide(t);
+		if(t->state == TRANS_CANCEL)
+		{
+			postTrans(C, t);
+			return 0;
+		}
 		break;
 	case TFM_BONE_ROLL:
 		initBoneRoll(t);
@@ -4766,7 +4771,11 @@
 	t->mode = TFM_EDGE_SLIDE;
 	t->transform = EdgeSlide;
 	
-	createSlideVerts(t);
+	if(!createSlideVerts(t)) {
+		t->state= TRANS_CANCEL;
+		return;
+	}
+	
 	sld = t->customData;
 
 	if (!sld)