Cleanup: comment line length (editors)

Prevents clang-format wrapping text before comments.

14 files changed, 96 insertions, 47 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 8e64ed93842..ef6e67b3d5c 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -548,7 +548,8 @@ void paintvert_tag_select_update(struct bContext *C, struct Object *ob)
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob->data);
 }
 
-/*  note: if the caller passes false to flush_flags, then they will need to run paintvert_flush_flags(ob) themselves */
+/*  note: if the caller passes false to flush_flags,
+ *  then they will need to run paintvert_flush_flags(ob) themselves */
 void paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags)
 {
 	Mesh *me;
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index bcde2411899..56d3162562f 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -76,7 +76,8 @@ static Object *make_prim_init(
 		obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, local_view_bits);
 
 		/* create editmode */
-		ED_object_editmode_enter(C, EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
+		/* rare cases the active layer is messed up */
+		ED_object_editmode_enter(C, EM_IGNORE_LAYER);
 		r_creation_data->was_editmode = true;
 	}
 
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 32ad8a7c521..f2ac54bf0f4 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -90,7 +90,8 @@ typedef struct {
 	float initial_length[NUM_VALUE_KINDS];
 	float scale[NUM_VALUE_KINDS];
 	NumInput num_input[NUM_VALUE_KINDS];
-	float shift_value[NUM_VALUE_KINDS]; /* The current value when shift is pressed. Negative when shift not active. */
+	/** The current value when shift is pressed. Negative when shift not active. */
+	float shift_value[NUM_VALUE_KINDS];
 	bool is_modal;
 
 	BevelObjectStore *ob_store;
@@ -189,7 +190,8 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 		if (i == OFFSET_VALUE) {
 			opdata->num_input[i].unit_sys = scene->unit.system;
 		}
-		opdata->num_input[i].unit_type[0] = B_UNIT_NONE;  /* Not sure this is a factor or a unit? */
+		/* Not sure this is a factor or a unit? */
+		opdata->num_input[i].unit_type[0] = B_UNIT_NONE;
 	}
 
 	/* avoid the cost of allocating a bm copy */
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 9eae3d3b564..4ec46ff9d2b 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -241,7 +241,8 @@ static bool edbm_inset_calc(wmOperator *op)
 	const float thickness          = RNA_float_get(op->ptr,   "thickness");
 	const float depth              = RNA_float_get(op->ptr,   "depth");
 	const bool use_outset          = RNA_boolean_get(op->ptr, "use_outset");
-	const bool use_select_inset    = RNA_boolean_get(op->ptr, "use_select_inset"); /* not passed onto the BMO */
+	/* not passed onto the BMO */
+	const bool use_select_inset    = RNA_boolean_get(op->ptr, "use_select_inset");
 	const bool use_individual      = RNA_boolean_get(op->ptr, "use_individual");
 	const bool use_interpolate     = RNA_boolean_get(op->ptr, "use_interpolate");
 
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c
index a625d8949a6..0d40f8589a1 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -637,8 +637,9 @@ static BMEdge *bm_face_split_edge_find(
 					ok = false;
 				}
 				else if (found_other_face) {
-					/* double check that _all_ the faces used by v_pivot's edges are attached to this edge
-					 * otherwise don't attempt the split since it will give non-deterministic results */
+					/* double check that _all_ the faces used by v_pivot's edges are attached
+					 * to this edge otherwise don't attempt the split since it will give
+					 * non-deterministic results */
 					BMLoop *l_radial_iter = l_iter->radial_next;
 					int other_face_shared = 0;
 					if (l_radial_iter != l_iter) {
@@ -786,7 +787,8 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op))
 							dot_test = fabsf(dot_v3v3(e_dir, l->f->no));
 							if (dot_test < dot_best) {
 
-								/* check we're in the correct corner (works with convex loops too) */
+								/* check we're in the correct corner
+								 * (works with convex loops too) */
 								if (angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, v_other->co, l->f->no) <
 								    angle_signed_on_axis_v3v3v3_v3(l->prev->v->co, l->v->co, l->next->v->co, l->f->no))
 								{
@@ -881,8 +883,8 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op))
 
 						for (int j = 0; j < 2; j++) {
 							BMVert *v_pivot = (&e->v1)[j];
-							/* checking that \a v_pivot isn't in the face
-							 * prevents attempting to splice the same vertex into an edge from multiple faces */
+							/* checking that \a v_pivot isn't in the face prevents attempting
+							 * to splice the same vertex into an edge from multiple faces */
 							if (!BM_vert_in_face(v_pivot, f)) {
 								float v_pivot_co[3];
 								float v_pivot_fac;
@@ -891,7 +893,8 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op))
 									v_pivot_co, &v_pivot_fac);
 
 								if (e_split) {
-									/* for degenerate cases this vertex may be in one of this edges radial faces */
+									/* for degenerate cases this vertex may be in one
+									 * of this edges radial faces */
 									if (!bm_vert_in_faces_radial(v_pivot, e_split, f)) {
 										BMEdge *e_new;
 										BMVert *v_new = BM_edge_split(bm, e_split, e_split->v1, &e_new, v_pivot_fac);
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index ca1251ef728..3667ec93140 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -2098,7 +2098,8 @@ static KnifeVert *knife_find_closest_vert(KnifeTool_OpData *kcd, float p[3], flo
 
 				knife_project_v2(kcd, kfv->cageco, kfv->sco);
 
-				/* be strict about angle snapping, the vertex needs to be very close to the angle, or we ignore */
+				/* be strict about angle snapping, the vertex needs to be very close to the angle,
+				 * or we ignore */
 				if (kcd->is_angle_snapping) {
 					if (dist_squared_to_line_segment_v2(kfv->sco, kcd->prev.mval, kcd->curr.mval) > KNIFE_FLT_EPSBIG) {
 						continue;
@@ -3120,7 +3121,8 @@ void EDBM_mesh_knife(bContext *C, LinkNode *polys, bool use_tag, bool cut_throug
 				keep_search = false;
 				BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
 					if (BM_elem_flag_test(f, BM_ELEM_TAG) == false && (F_ISECT_IS_UNKNOWN(f))) {
-						/* am I connected to a tagged face via an un-tagged edge (ie, not across a cut) */
+						/* am I connected to a tagged face via an un-tagged edge
+						 * (ie, not across a cut) */
 						BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
 						BMLoop *l_iter = l_first;
 						bool found = false;
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 9c5372cafd8..352b0072c4d 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -221,10 +221,13 @@ static void ringsel_finish(bContext *C, wmOperator *op)
 			/* XXX Is this piece of code ever used now? Simple loop select is now
 			 *     in editmesh_select.c (around line 1000)... */
 			/* sets as active, useful for other tools */
-			if (em->selectmode & SCE_SELECT_VERTEX)
-				BM_select_history_store(em->bm, lcd->eed->v1);  /* low priority TODO, get vertrex close to mouse */
-			if (em->selectmode & SCE_SELECT_EDGE)
+			if (em->selectmode & SCE_SELECT_VERTEX) {
+				/* low priority TODO, get vertrex close to mouse */
+				BM_select_history_store(em->bm, lcd->eed->v1);
+			}
+			if (em->selectmode & SCE_SELECT_EDGE) {
 				BM_select_history_store(em->bm, lcd->eed);
+			}
 
 			EDBM_selectmode_flush(lcd->em);
 			DEG_id_tag_update(lcd->ob->data, ID_RECALC_SELECT);
@@ -698,7 +701,8 @@ void MESH_OT_loopcut(wmOperatorType *ot)
 
 	/* properties */
 	prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, 1000000, "Number of Cuts", "", 1, 100);
-	/* avoid re-using last var because it can cause _very_ high poly meshes and annoy users (or worse crash) */
+	/* avoid re-using last var because it can cause
+	 * _very_ high poly meshes and annoy users (or worse crash) */
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 
 	prop = RNA_def_float(ot->srna, "smoothness", 0.0f, -1e3f, 1e3f,
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index 91d08953b8a..36dc6797edb 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -72,7 +72,8 @@
  * \{ */
 
 struct PathSelectParams {
-	bool track_active;  /* ensure the active element is the last selected item (handy for picking) */
+	/** ensure the active element is the last selected item (handy for picking) */
+	bool track_active;
 	bool use_topology_distance;
 	bool use_face_step;
 	bool use_fill;
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index f00973768ed..ff522430e2a 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -313,7 +313,8 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm)
 		uid = uid_end + bm->totedge;
 
 		lp = BLI_array_append_ret(eloop_pairs);
-		BM_edge_loop_pair(e_last, &lp->l_a, &lp->l_b); /* no need to check, we know this will be true */
+		/* no need to check, we know this will be true */
+		BM_edge_loop_pair(e_last, &lp->l_a, &lp->l_b);
 
 
 		BLI_assert(tot == uid_end - uid_start);
@@ -795,7 +796,8 @@ static int edbm_rip_invoke__vert(bContext *C, const wmEvent *event, Object *obed
 
 					if (do_fill) {
 						/* Only needed when filling...
-						 * Also, we never want to tag best edge, that one won't change during split. See T44618. */
+						 * Also, we never want to tag best edge,
+						 * that one won't change during split. See T44618. */
 						if (larr[larr_len]->e == e_best) {
 							BM_elem_flag_enable(larr[larr_len]->prev->e, BM_ELEM_TAG);
 						}
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index e522c8849c7..11de1759d42 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -204,7 +204,8 @@ void EDBM_automerge(Scene *scene, Object *obedit, bool update, const char hflag)
 /** \name Back-Buffer OpenGL Selection
  * \{ */
 
-unsigned int bm_solidoffs = 0, bm_wireoffs = 0, bm_vertoffs = 0;    /* set in drawobject.c ... for colorindices */
+/* set in drawobject.c ... for colorindices */
+unsigned int bm_solidoffs = 0, bm_wireoffs = 0, bm_vertoffs = 0;
 
 /* facilities for box select and circle select */
 static BLI_bitmap *selbuf = NULL;
@@ -2245,7 +2246,8 @@ void EDBM_selectmode_set(BMEditMesh *em)
 
 	em->bm->selectmode = em->selectmode;
 
-	edbm_strip_selections(em); /* strip BMEditSelections from em->selected that are not relevant to new mode */
+	/* strip BMEditSelections from em->selected that are not relevant to new mode */
+	edbm_strip_selections(em);
 
 	if (em->bm->totvertsel == 0 &&
 	    em->bm->totedgesel == 0 &&
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 27ff9333492..3af4708ee9b 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -171,7 +171,8 @@ void MESH_OT_subdivide(wmOperatorType *ot)
 
 	/* properties */
 	prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, 100, "Number of Cuts", "", 1, 10);
-	/* avoid re-using last var because it can cause _very_ high poly meshes and annoy users (or worse crash) */
+	/* avoid re-using last var because it can cause
+	 * _very_ high poly meshes and annoy users (or worse crash) */
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 
 	RNA_def_float(ot->srna, "smoothness", 0.0f, 0.0f, 1e3f, "Smoothness", "Smoothness factor", 0.0f, 1.0f);
@@ -1173,7 +1174,8 @@ static bool edbm_connect_vert_pair(BMEditMesh *em, wmOperator *op)
 			len = 0;
 		}
 		else {
-			EDBM_selectmode_flush(em);  /* so newly created edges get the selection state from the vertex */
+			/* so newly created edges get the selection state from the vertex */
+			EDBM_selectmode_flush(em);
 
 			EDBM_update_generic(em, true, true);
 		}
@@ -1906,7 +1908,8 @@ static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op)
 		EDBM_op_init(em, &bmop, op, "rotate_edges edges=%he use_ccw=%b", BM_ELEM_TAG, use_ccw);
 
 		/* avoids leaving old verts selected which can be a problem running multiple times,
-		 * since this means the edges become selected around the face which then attempt to rotate */
+		 * since this means the edges become selected around the face
+		 * which then attempt to rotate */
 		BMO_slot_buffer_hflag_disable(em->bm, bmop.slots_in, "edges", BM_EDGE, BM_ELEM_SELECT, true);
 
 		BMO_op_exec(em->bm, &bmop);
@@ -3464,8 +3467,10 @@ static float bm_edge_seg_isect(
 		y12 = mouse_path[i][1];
 
 		/* Perp. Distance from point to line */
-		if (m2 != MAXSLOPE) dist = (y12 - m2 * x12 - b2);  /* /sqrt(m2 * m2 + 1); Only looking for */
-		/* change in sign.  Skip extra math */
+		if (m2 != MAXSLOPE) {
+			/* /sqrt(m2 * m2 + 1); Only looking for change in sign.  Skip extra math .*/
+			dist = (y12 - m2 * x12 - b2);
+		}
 		else dist = x22 - x12;
 
 		if (i == 0) lastdist = dist;
@@ -3592,7 +3597,8 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op)
 
 	/* TODO, investigate using index lookup for screen_vert_coords() rather then a hash table */
 
-	/* the floating point coordinates of verts in screen space will be stored in a hash table according to the vertices pointer */
+	/* the floating point coordinates of verts in screen space will be
+	 * stored in a hash table according to the vertices pointer */
 	screen_vert_coords = sco = MEM_mallocN(bm->totvert * sizeof(float) * 2, __func__);
 
 	BM_ITER_MESH_INDEX (bv, &iter, bm, BM_VERTS_OF_MESH, i) {
@@ -3723,8 +3729,12 @@ static Base *mesh_separate_tagged(Main *bmain, Scene *scene, ViewLayer *view_lay
 	CustomData_bmesh_init_pool(&bm_new->pdata, bm_mesh_allocsize_default.totface, BM_FACE);
 
 	base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, USER_DUP_MESH);
-	/* DAG_relations_tag_update(bmain); */ /* normally would call directly after but in this case delay recalc */
-	assign_matarar(bmain, base_new->object, give_matarar(obedit), *give_totcolp(obedit)); /* new in 2.5 */
+
+	/* normally would call directly after but in this case delay recalc */
+	/* DAG_relations_tag_update(bmain); */
+
+	/* new in 2.5 */
+	assign_matarar(bmain, base_new->object, give_matarar(obedit), *give_totcolp(obedit));
 
 	ED_object_base_select(base_new, BA_SELECT);
 
@@ -5662,7 +5672,8 @@ static void sort_bmelem_flag(
 		float fact = reverse ? -1.0 : 1.0;
 		int coidx = (action == SRT_VIEW_ZAXIS) ? 2 : 0;
 
-		mul_m4_m4m4(mat, rv3d->viewmat, ob->obmat);  /* Apply the view matrix to the object matrix. */
+		/* Apply the view matrix to the object matrix. */
+		mul_m4_m4m4(mat, rv3d->viewmat, ob->obmat);
 
 		if (totelem[0]) {
 			pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock");
@@ -5801,9 +5812,11 @@ static void sort_bmelem_flag(
 				float srt = reverse ? (float)(MAXMAT - fa->mat_nr) : (float)fa->mat_nr;
 				pb[i] = false;
 				sb[affected[2]].org_idx = i;
-				/* Multiplying with totface and adding i ensures us we keep current order for all faces of same mat. */
+				/* Multiplying with totface and adding i ensures us
+				 * we keep current order for all faces of same mat. */
 				sb[affected[2]++].srt = srt * ((float)totelem[2]) + ((float)i);
-/*				printf("e: %d; srt: %f; final: %f\n", i, srt, srt * ((float)totface) + ((float)i));*/
+				// printf("e: %d; srt: %f; final: %f\n",
+				//        i, srt, srt * ((float)totface) + ((float)i));
 			}
 			else {
 				pb[i] = true;
@@ -7260,7 +7273,10 @@ static void point_normals_apply(bContext *C, wmOperator *op, float target[3], co
 			float spherized_normal[3];
 
 			sub_v3_v3v3(spherized_normal, target, lnor_ed->loc);
-			normalize_v3(spherized_normal);  /* otherwise, multiplication by strength is meaningless... */
+
+			/* otherwise, multiplication by strength is meaningless... */
+			normalize_v3(spherized_normal);
+
 			mul_v3_fl(spherized_normal, strength);
 			mul_v3_v3fl(lnor_ed->nloc, lnor_ed->niloc, 1.0f - strength);
 			add_v3_v3(lnor_ed->nloc, spherized_normal);
@@ -7346,7 +7362,8 @@ static int edbm_point_normals_modal(bContext *C, wmOperator *op, const wmEvent *
 
 			case EDBM_CLNOR_MODAL_POINTTO_USE_MOUSE:
 				new_mode = EDBM_CLNOR_POINTTO_MODE_MOUSE;
-				force_mousemove = true;  /* We want to immediately update to mouse cursor position... */
+				/* We want to immediately update to mouse cursor position... */
+				force_mousemove = true;
 				ret = OPERATOR_RUNNING_MODAL;
 				break;
 
@@ -7367,7 +7384,9 @@ static int edbm_point_normals_modal(bContext *C, wmOperator *op, const wmEvent *
 				new_mode = EDBM_CLNOR_POINTTO_MODE_COORDINATES;
 				view3d_operator_needs_opengl(C);
 				if (EDBM_select_pick(C, event->mval, false, false, false)) {
-					ED_object_calc_active_center_for_editmode(obedit, false, target);  /* Point to newly selected active. */
+					/* Point to newly selected active. */
+					ED_object_calc_active_center_for_editmode(obedit, false, target);
+
 					add_v3_v3(target, obedit->loc);
 					ret = OPERATOR_RUNNING_MODAL;
 				}
@@ -7490,7 +7509,8 @@ static int edbm_point_normals_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	/* Note that 'mode' is ignored in exec case, we directly use vector stored in target_location, whatever that is. */
+	/* Note that 'mode' is ignored in exec case,
+	 * we directly use vector stored in target_location, whatever that is. */
 
 	float target[3];
 	RNA_float_get_array(op->ptr, "target_location", target);
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 6c4e82f5b71..7e02e657321 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -802,7 +802,8 @@ UvElementMap *BM_uv_element_map_create(
 		island_number = MEM_mallocN(sizeof(*island_number) * totfaces, "uv_island_number_face");
 		copy_vn_i(island_number, totfaces, INVALID_ISLAND);
 
-		/* at this point, every UvElement in vert points to a UvElement sharing the same vertex. Now we should sort uv's in islands. */
+		/* at this point, every UvElement in vert points to a UvElement sharing the same vertex.
+		 * Now we should sort uv's in islands. */
 		for (i = 0; i < totuv; i++) {
 			if (element_map->buf[i].island == INVALID_ISLAND) {
 				element_map->buf[i].island = nislands;
@@ -821,7 +822,8 @@ UvElementMap *BM_uv_element_map_create(
 								initelement = element;
 
 							if (element->l->f == efa) {
-								/* found the uv corresponding to our face and vertex. Now fill it to the buffer */
+								/* found the uv corresponding to our face and vertex.
+								 * Now fill it to the buffer */
 								element->island = nislands;
 								map[element - element_map->buf] = islandbufsize;
 								islandbuf[islandbufsize].l = element->l;
@@ -1228,7 +1230,8 @@ void EDBM_mesh_hide(BMEditMesh *em, bool swap)
 	EDBM_selectmode_flush(em);
 
 	/* original hide flushing comment (OUTDATED):
-	 * hide happens on least dominant select mode, and flushes up, not down! (helps preventing errors in subsurf) */
+	 * hide happens on least dominant select mode, and flushes up, not down!
+	 * (helps preventing errors in subsurf) */
 	/* - vertex hidden, always means edge is hidden too
 	 * - edge hidden, always means face is hidden too
 	 * - face hidden, only set face hide
diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c
index b9479a660f9..32b0b653242 100644
--- a/source/blender/editors/mesh/mesh_mirror.c
+++ b/source/blender/editors/mesh/mesh_mirror.c
@@ -317,7 +317,8 @@ void ED_mesh_mirrtopo_init(
 	if (em) {
 		BMVert **vtable = em->bm->vtable;
 		for (a = 1; a <= totvert; a++) {
-			/* printf("I %d %ld %d\n", (a - last), MirrTopoPairs[a].hash, MirrTopoPairs[a].v_indexs); */
+			// printf("I %d %ld %d\n",
+			//        (a - last), MirrTopoPairs[a].hash, MirrTopoPairs[a].v_indexs);
 			if ((a == totvert) || (topo_pairs[a - 1].hash != topo_pairs[a].hash)) {
 				const int match_count = a - last;
 				if (match_count == 2) {
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index adbd6e12048..05c0fddfda0 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -151,7 +151,8 @@ static void join_mesh_single(
 					/* check if this mesh has such a shapekey */
 					KeyBlock *okb = me->key ? BKE_keyblock_find_name(me->key, kb->name) : NULL;
 					if (okb) {
-						/* copy this mesh's shapekey to the destination shapekey (need to transform first) */
+						/* copy this mesh's shapekey to the destination shapekey
+						 * (need to transform first) */
 						float (*ocos)[3] = okb->data;
 						for (a = 0; a < me->totvert; a++, cos++, ocos++) {
 							copy_v3_v3(*cos, *ocos);
@@ -400,7 +401,8 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 
 
 			if (me->totvert) {
-				/* Add this object's materials to the base one's if they don't exist already (but only if limits not exceeded yet) */
+				/* Add this object's materials to the base one's if they don't exist already
+				 * (but only if limits not exceeded yet) */
 				if (totcol < MAXMAT) {
 					for (a = 1; a <= ob_iter->totcol; a++) {
 						ma = give_current_material(ob_iter, a);
@@ -423,7 +425,8 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 					}
 				}
 
-				/* if this mesh has shapekeys, check if destination mesh already has matching entries too */
+				/* if this mesh has shapekeys,
+				 * check if destination mesh already has matching entries too */
 				if (me->key && key) {
 					/* for remapping KeyBlock.relative */
 					int      *index_map = MEM_mallocN(sizeof(int)        * me->key->totkey, __func__);
@@ -454,7 +457,8 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 
 					/* remap relative index values */
 					for (kb = me->key->block.first, i = 0; kb; kb = kb->next, i++) {
-						if (LIKELY(kb->relative < me->key->totkey)) {  /* sanity check, should always be true */
+						/* sanity check, should always be true */
+						if (LIKELY(kb->relative < me->key->totkey)) {
 							kb_map[i]->relative = index_map[kb->relative];
 						}
 					}
@@ -488,8 +492,10 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 	/* inverse transform for all selected meshes in this object */
 	invert_m4_m4(imat, ob->obmat);
 
-	/* Add back active mesh first. This allows to keep things similar as they were, as much as possible (i.e. data from
-	 * active mesh will remain first ones in new result of the merge, in same order for CD layers, etc. See also T50084.
+	/* Add back active mesh first.
+	 * This allows to keep things similar as they were, as much as possible
+	 * (i.e. data from active mesh will remain first ones in new result of the merge,
+	 * in same order for CD layers, etc). See also T50084.
 	 */
 	join_mesh_single(
 	            depsgraph, bmain, scene,