[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55891] trunk/blender/source/blender/ editors/mesh: inset and bevel could both be activated when there was no selection.

[Campbell Barton]

Revision: 55891
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55891
Author:   campbellbarton
Date:     2013-04-08 02:14:58 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
inset and bevel could both be activated when there was no selection.

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bevel.c	2013-04-08 02:04:26 UTC (rev 55890)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bevel.c	2013-04-08 02:14:58 UTC (rev 55891)
@@ -97,7 +97,7 @@
 	BMEditMesh *em = BMEdit_FromObject(obedit);
 	BevelData *opdata;
 
-	if (em == NULL) {
+	if (em->bm->totvertsel == 0) {
 		return 0;
 	}
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_inset.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_inset.c	2013-04-08 02:04:26 UTC (rev 55890)
+++ trunk/blender/source/blender/editors/mesh/editmesh_inset.c	2013-04-08 02:14:58 UTC (rev 55891)
@@ -113,6 +113,10 @@
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BMEdit_FromObject(obedit);
 
+	if (em->bm->totvertsel == 0) {
+		return 0;
+	}
+
 	op->customdata = opdata = MEM_mallocN(sizeof(InsetData), "inset_operator_data");
 
 	opdata->old_thickness = 0.01;
@@ -239,7 +243,9 @@
 
 static int edbm_inset_exec(bContext *C, wmOperator *op)
 {
-	edbm_inset_init(C, op, false);
+	if (!edbm_inset_init(C, op, false)) {
+		return OPERATOR_CANCELLED;
+	}
 
 	if (!edbm_inset_calc(op)) {
 		edbm_inset_exit(C, op);
@@ -257,7 +263,9 @@
 	float mlen[2];
 	float center_3d[3];
 
-	edbm_inset_init(C, op, true);
+	if (!edbm_inset_init(C, op, true)) {
+		return OPERATOR_CANCELLED;
+	}
 
 	opdata = op->customdata;