archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2010-11-25 15:03:36 +00:00
parent 2d0a1f4de2
commit c8fb984ee6
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -5841,6 +5841,7 @@ static int merge_exec(bContext *C, wmOperator *op)
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 @@ static int merge_exec(bContext *C, wmOperator *op)
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);