[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25935] trunk/blender/source/blender/ editors/transform/transform_conversions.c: [#19960] When Loop Cutting, no Edge Sliding in Face Select Mode, but works in other Select Modes

[Martin Poirier]

Revision: 25935
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25935
Author:   theeth
Date:     2010-01-12 20:44:23 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
[#19960] When Loop Cutting, no Edge Sliding in Face Select Mode, but works in other Select Modes

Force edge select (internally) when running edge slide.

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

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-01-12 18:56:39 UTC (rev 25934)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-01-12 19:44:23 UTC (rev 25935)
@@ -2139,14 +2139,20 @@
 	int count=0, countsel=0, a, totleft;
 	int propmode = t->flag & T_PROP_EDIT;
 	int mirror = 0;
+	short selectmode = ts->selectmode;
 
 	if (t->flag & T_MIRROR)
 	{
 		mirror = 1;
 	}
 
+	/* edge slide forces edge select */
+	if (t->mode == TFM_EDGE_SLIDE) {
+		selectmode = SCE_SELECT_EDGE;
+	}
+
 	// transform now requires awareness for select mode, so we tag the f1 flags in verts
-	if(ts->selectmode & SCE_SELECT_VERTEX) {
+	if(selectmode & SCE_SELECT_VERTEX) {
 		for(eve= em->verts.first; eve; eve= eve->next) {
 			if(eve->h==0 && (eve->f & SELECT))
 				eve->f1= SELECT;
@@ -2154,7 +2160,7 @@
 				eve->f1= 0;
 		}
 	}
-	else if(ts->selectmode & SCE_SELECT_EDGE) {
+	else if(selectmode & SCE_SELECT_EDGE) {
 		EditEdge *eed;
 		for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
 		for(eed= em->edges.first; eed; eed= eed->next) {