Fixed a disconnected vertex in bevel; fixed header print for bevel.

2 files changed, 11 insertions, 2 deletions

diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index b13b067cc08..5a13b0c084a 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -269,7 +269,8 @@ void recalculate_additional_vert(BMesh* bm, BevelParams* bp, VertexItem *vi, BME
 		normalize_v3(ve);
 		mul_v3_fl(ve, length);
 		add_v3_v3(ve, v->co);
-		vi->v = BM_vert_create(bm, ve, NULL);
+		BMO_elem_flag_enable(bm, vi->v, BEVEL_DEL);
+		vi->v = bevel_create_unique_vertex(bm, bp, ve);
 	}
 }
 
@@ -334,7 +335,7 @@ BMVert* bevel_middle_vert(BMesh *bm, BevelParams *bp, BMEdge *edge_a, BMEdge *ed
 	mul_v3_fl(norm_c, offset / sin(angel/2));
 	add_v3_v3(norm_c, vert->co);
 
-	new_vert = BM_vert_create(bm, norm_c, NULL);
+	new_vert = bevel_create_unique_vertex(bm, bp, norm_c);
 
 	return new_vert;
 }
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 25ac0b1b5ac..e0319473f4f 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4554,7 +4554,11 @@ typedef struct {
 
 static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 {
+#ifdef OLDBEV
 	static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RMB), factor: %s, Use Dist (D): %s: Use Even (E): %s";
+#else
+	static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RMB), factor: %s, segments: %d";
+#endif
 
 	char msg[HEADER_LENGTH];
 	ScrArea *sa = CTX_wm_area(C);
@@ -4566,6 +4570,7 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 			outputNumInput(&opdata->num_input, factor_str);
 		else
 			BLI_snprintf(factor_str, NUM_STR_REP_LEN, "%f", RNA_float_get(op->ptr, "percent"));
+#ifdef OLDBEV
 		BLI_snprintf(msg, HEADER_LENGTH, str,
 		             factor_str,
 		             RNA_boolean_get(op->ptr, "use_dist") ? "On" : "Off",
@@ -4574,6 +4579,9 @@ static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 					 RNA_float_get(op->ptr, "Amount"),
 					 RNA_int_get(op->ptr, "Segmentation")
 					 );
+#else
+		BLI_snprintf(msg, HEADER_LENGTH, str, factor_str, RNA_int_get(op->ptr, "segmentation"));
+#endif
 
 		ED_area_headerprint(sa, msg);
 	}