[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26029] trunk/blender/source/blender/ editors/mesh/loopcut.c: Fix [#20418] ring select in face mode selects edges not faces

[Matt Ebb]

Revision: 26029
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26029
Author:   broken
Date:     2010-01-16 01:59:59 +0100 (Sat, 16 Jan 2010)

Log Message:
-----------
Fix [#20418] ring select in face mode selects edges not faces

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/loopcut.c

Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c	2010-01-16 00:49:58 UTC (rev 26028)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c	2010-01-16 00:59:59 UTC (rev 26029)
@@ -332,16 +332,23 @@
 	tringselOpData *lcd;
 	EditEdge *edge;
 	int dist = 75;
-
+	
 	view3d_operator_needs_opengl(C);
 
 	if (!ringsel_init(C, op, 0))
 		return OPERATOR_CANCELLED;
 	
+	lcd = op->customdata;
+	
+	if (lcd->em->selectmode == SCE_SELECT_FACE) {
+		ringsel_exit(C, op);
+		WM_operator_name_call(C, "MESH_OT_loop_select", WM_OP_INVOKE_REGION_WIN, NULL);
+		return OPERATOR_CANCELLED;
+	}
+	
 	/* add a modal handler for this operator - handles loop selection */
 	WM_event_add_modal_handler(C, op);
 
-	lcd = op->customdata;
 	lcd->vc.mval[0] = evt->mval[0];
 	lcd->vc.mval[1] = evt->mval[1];