[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33311] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: bugfix [#24916] Blender Crash after inappropriate Merge-Command

[Campbell Barton]

Revision: 33311
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33311
Author:   campbellbarton
Date:     2010-11-25 16:03:36 +0100 (Thu, 25 Nov 2010)

Log Message:
-----------
bugfix [#24916] Blender Crash after inappropriate Merge-Command

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2010-11-25 14:56:02 UTC (rev 33310)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2010-11-25 15:03:36 UTC (rev 33311)
@@ -5841,6 +5841,7 @@
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	int count= 0, uvs= RNA_boolean_get(op->ptr, "uvs");
+	EditSelection *ese;
 
 	switch(RNA_enum_get(op->ptr, "type")) {
 		case 3:
@@ -5850,10 +5851,21 @@
 			count = merge_target(C, em, 1, uvs);
 			break;
 		case 1:
-			count = merge_firstlast(em, 0, uvs);
+			ese= (EditSelection *)em->selected.last;
+			if(ese && ese->type == EDITVERT) {
+				count = merge_firstlast(em, 0, uvs);
+			} else {
+				BKE_report(op->reports, RPT_ERROR, "no last selected vertex set");
+			}
 			break;
 		case 6:
-			count = merge_firstlast(em, 1, uvs);
+			ese= (EditSelection *)em->selected.first;
+			if(ese && ese->type == EDITVERT) {
+				count = merge_firstlast(em, 1, uvs);
+			}
+			else {
+				BKE_report(op->reports, RPT_ERROR, "no last selected vertex set");
+			}
 			break;
 		case 5:
 			count = collapseEdges(em);