use clearer names for 'single' bmesh operator args & add '%e' to BMO_op_vinitf comments.

3 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 7fb78d2d160..d27a90f0366 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -258,19 +258,19 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
-	BMVert *v, *snapv;
+	BMVert *v, *vert_snap;
 	BMLoop *l, *firstl = NULL;
 	float fac;
 	int i, tot;
 
-	snapv = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "snapv"));
-	tot = BM_vert_face_count(snapv);
+	vert_snap = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "vert_snap"));
+	tot = BM_vert_face_count(vert_snap);
 
 	if (!tot)
 		return;
 
 	fac = 1.0f / tot;
-	BM_ITER_ELEM (l, &iter, snapv, BM_LOOPS_OF_VERT) {
+	BM_ITER_ELEM (l, &iter, vert_snap, BM_LOOPS_OF_VERT) {
 		if (!firstl) {
 			firstl = l;
 		}
@@ -343,7 +343,7 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator weldop;
 	BMOIter siter;
-	BMVert *v, *snapv = NULL;
+	BMVert *v, *vert_snap = NULL;
 	float vec[3];
 	BMOpSlot *slot_targetmap;
 	
@@ -355,12 +355,12 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
 	slot_targetmap = BMO_slot_get(weldop.slots_in, "targetmap");
 
 	BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
-		if (!snapv) {
-			snapv = v;
-			copy_v3_v3(snapv->co, vec);
+		if (!vert_snap) {
+			vert_snap = v;
+			copy_v3_v3(vert_snap->co, vec);
 		}
 		else {
-			BMO_slot_map_elem_insert(&weldop, slot_targetmap, v, snapv);
+			BMO_slot_map_elem_insert(&weldop, slot_targetmap, v, vert_snap);
 		}
 	}
 
diff --git a/source/blender/bmesh/operators/bmo_slide.c b/source/blender/bmesh/operators/bmo_slide.c
index 040c2d41e9c..ea9f9bf9eba 100644
--- a/source/blender/bmesh/operators/bmo_slide.c
+++ b/source/blender/bmesh/operators/bmo_slide.c
@@ -53,7 +53,7 @@ void bmo_slide_vert_exec(BMesh *bm, BMOperator *op)
 	int selected_edges = 0;
 
 	/* Get slide amount */
-	const float distance_t = BMO_slot_float_get(op->slots_in, "distance_t");
+	const float factor = BMO_slot_float_get(op->slots_in, "factor");
 
 	/* Get start vertex */
 	vertex = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "vert"));
@@ -101,7 +101,7 @@ void bmo_slide_vert_exec(BMesh *bm, BMOperator *op)
 		BMO_elem_flag_enable(bm, vertex, VERT_MARK);
 
 		/* Interpolate */
-		interp_v3_v3v3(vertex->co, vertex->co, other->co, distance_t);
+		interp_v3_v3v3(vertex->co, vertex->co, other->co, factor);
 	}
 
 	/* Return the new edge. The same previously marked with VERT_MARK */
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index c7ab8f62f40..dde3c526c13 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -711,8 +711,8 @@ void bmo_shortest_path_exec(BMesh *bm, BMOperator *op)
 	int num_total = 0 /*, num_sels = 0 */, i = 0;
 	const int type = BMO_slot_int_get(op->slots_in, "type");
 
-	sv = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "startv"));
-	ev = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "endv"));
+	sv = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "vert_start"));
+	ev = BMO_slot_buffer_get_single(BMO_slot_get(op->slots_in, "vert_end"));
 
 	num_total = BM_mesh_elem_count(bm, BM_VERT);