Cleanup: comment line length (editors)

Prevents clang-format wrapping text before comments.

24 files changed, 510 insertions, 268 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 7d82e8d2377..d60e2d0cdb6 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -164,7 +164,8 @@ void ui_block_to_window_rctf(const ARegion *ar, uiBlock *block, rctf *rct_dst, c
 	ui_block_to_window_fl(ar, block, &rct_dst->xmax, &rct_dst->ymax);
 }
 
-void ui_window_to_block_fl(const ARegion *ar, uiBlock *block, float *x, float *y)   /* for mouse cursor */
+/* for mouse cursor */
+void ui_window_to_block_fl(const ARegion *ar, uiBlock *block, float *x, float *y)
 {
 	float a, b, c, d, e, f, px, py;
 	int sx, sy, getsizex, getsizey;
@@ -505,7 +506,8 @@ static void ui_block_bounds_calc_popup(
 	ui_block_bounds_calc(block);
 
 	/* If given, adjust input coordinates such that they would generate real final popup position.
-	 * Needed to handle correctly floating panels once they have been dragged around, see T52999. */
+	 * Needed to handle correctly floating panels once they have been dragged around,
+	 * see T52999. */
 	if (r_xy) {
 		r_xy[0] = xy[0] + block->rect.xmin - raw_x;
 		r_xy[1] = xy[1] + block->rect.ymin - raw_y;
@@ -1116,7 +1118,8 @@ static bool ui_but_event_property_operator_string(
 	/* Don't use the button again. */
 	but = NULL;
 
-	/* this version is only for finding hotkeys for properties (which get set via context using operators) */
+	/* this version is only for finding hotkeys for properties
+	 * (which get set via context using operators) */
 	if (prop) {
 		/* to avoid massive slowdowns on property panels, for now, we only check the
 		 * hotkeys for Editor / Scene settings...
@@ -1327,7 +1330,8 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
 					continue;
 				}
 				else if (((block->flag & UI_BLOCK_POPOVER) == 0) && UI_but_is_tool(but)) {
-					/* For non-popovers, shown in shortcut only (has special shortcut handling code). */
+					/* For non-popovers, shown in shortcut only
+					 * (has special shortcut handling code). */
 					continue;
 				}
 			}
@@ -2090,7 +2094,8 @@ void ui_but_value_set(uiBut *but, double value)
 				case PROP_ENUM:
 					if (RNA_property_flag(prop) & PROP_ENUM_FLAG) {
 						int ivalue = (int)value;
-						ivalue ^= RNA_property_enum_get(&but->rnapoin, prop); /* toggle for enum/flag buttons */
+						/* toggle for enum/flag buttons */
+						ivalue ^= RNA_property_enum_get(&but->rnapoin, prop);
 						RNA_property_enum_set(&but->rnapoin, prop, ivalue);
 					}
 					else {
@@ -2294,7 +2299,8 @@ static float ui_get_but_step_unit(uiBut *but, float step_default)
 {
 	int unit_type = RNA_SUBTYPE_UNIT_VALUE(UI_but_unit_type_get(but));
 	const double step_orig = step_default * UI_PRECISION_FLOAT_SCALE;
-	/* Scaling up 'step_origg ' here is a bit arbitrary, its just giving better scales from user POV */
+	/* Scaling up 'step_origg ' here is a bit arbitrary,
+	 * its just giving better scales from user POV */
 	const double scale_step = ui_get_but_scale_unit(but, step_orig * 10);
 	const double step = bUnit_ClosestScalar(scale_step, but->block->unit->system, unit_type);
 
@@ -2514,7 +2520,8 @@ bool ui_but_string_set_eval_num(bContext *C, uiBut *but, const char *str, double
 		bool is_unit_but = (ui_but_is_float(but) && ui_but_is_unit(but));
 		/* only enable verbose if we won't run again with units */
 		if (BPY_execute_string_as_number(C, NULL, str, is_unit_but == false, r_value)) {
-			/* if the value parsed ok without unit conversion this button may still need a unit multiplier */
+			/* if the value parsed ok without unit conversion
+			 * this button may still need a unit multiplier */
 			if (is_unit_but) {
 				char str_new[128];
 
@@ -3569,7 +3576,8 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *bu
 					uiItemL(column, item->name, item->icon);
 				}
 				else {
-					/* Do not use uiItemL here, as our root layout is a menu one, it will add a fake blank icon! */
+					/* Do not use uiItemL here, as our root layout is a menu one,
+					 * it will add a fake blank icon! */
 					uiDefBut(block, UI_BTYPE_LABEL, 0, item->name, 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 				}
 			}
@@ -4588,7 +4596,8 @@ void UI_but_func_search_set(
         uiButSearchFunc search_func, void *arg,
         uiButHandleFunc bfunc, void *active)
 {
-	/* needed since callers don't have access to internal functions (as an alternative we could expose it) */
+	/* needed since callers don't have access to internal functions
+	 * (as an alternative we could expose it) */
 	if (search_create_func == NULL) {
 		search_create_func = ui_searchbox_create_generic;
 	}
@@ -4637,7 +4646,8 @@ static void operator_enum_search_cb(const struct bContext *C, void *but, const c
 		RNA_property_enum_items_gettexted((bContext *)C, ptr, prop, &item_array, NULL, &do_free);
 
 		for (item = item_array; item->identifier; item++) {
-			/* note: need to give the index rather than the identifier because the enum can be freed */
+			/* note: need to give the index rather than the
+			 * identifier because the enum can be freed */
 			if (BLI_strcasestr(item->name, str)) {
 				if (false == UI_search_item_add(items, item->name, POINTER_FROM_INT(item->value), item->icon))
 					break;
diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index d102c7c582d..488ee0fd003 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -42,22 +42,25 @@
 #ifdef USE_UIBUT_SPATIAL_ALIGN
 
 /**
- * This struct stores a (simplified) 2D representation of all buttons of a same align group, with their
- * immediate neighbors (if found), and needed value to compute 'stitching' of aligned buttons.
+ * This struct stores a (simplified) 2D representation of all buttons of a same align group,
+ * with their immediate neighbors (if found),
+ * and needed value to compute 'stitching' of aligned buttons.
  *
- * \note This simplistic struct cannot fully represent complex layouts where buttons share some 'align space' with
- *       several others (see schema below), we'd need linked list and more complex code to handle that.
- *       However, looks like we can do without that for now, which is rather lucky!
+ * \note This simplistic struct cannot fully represent complex layouts where buttons share some
+ *       'align space' with several others (see schema below), we'd need linked list and more
+ *       complex code to handle that. However, looks like we can do without that for now,
+ *       which is rather lucky!
  *
  *       <pre>
- *       +-----------+-----------+
- *       |   BUT 1   |   BUT 2   |      BUT 3 has two 'top' neighbors...
- *       |-----------------------|  =>  In practice, we only store one of BUT 1 or 2 (which ones is not
- *       |         BUT 3         |      really deterministic), and assume the other stores a ref to BUT 3.
- *       +-----------------------+
+ *       +--------+-------+
+ *       | BUT 1  | BUT 2 |      BUT 3 has two 'top' neighbors...
+ *       |----------------|  =>  In practice, we only store one of BUT 1 or 2 (which ones is not
+ *       |      BUT 3     |      really deterministic), and assume the other stores a ref to BUT 3.
+ *       +----------------+
  *       </pre>
  *
- *       This will probably not work in all possible cases, but not sure we want to support such exotic cases anyway.
+ *       This will probably not work in all possible cases,
+ *       but not sure we want to support such exotic cases anyway.
  */
 typedef struct ButAlign {
 	uiBut *but;
@@ -71,13 +74,15 @@ typedef struct ButAlign {
 	/* Distances to the neighbors. */
 	float dists[4];
 
-	/* Flags, used to mark whether we should 'stitch' the corners of this button with its neighbors' ones. */
+	/* Flags, used to mark whether we should 'stitch'
+	 * the corners of this button with its neighbors' ones. */
 	char flags[4];
 } ButAlign;
 
 /* Side-related enums and flags. */
 enum {
-	/* Sides (used as indices, order is **crucial**, this allows us to factorize code in a loop over the four sides). */
+	/* Sides (used as indices, order is **crucial**,
+	 * this allows us to factorize code in a loop over the four sides). */
 	LEFT         = 0,
 	TOP          = 1,
 	RIGHT        = 2,
@@ -162,14 +167,17 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
 	}
 
 	for (side = 0; side < RIGHT; side++) {
-		/* We are only interested in buttons which share a same line (LEFT/RIGHT sides) or column (TOP/DOWN sides). */
+		/* We are only interested in buttons which share a same line
+		 * (LEFT/RIGHT sides) or column (TOP/DOWN sides). */
 		if (buts_share[IS_COLUMN(side)]) {
 			side_opp = OPPOSITE(side);
 
-			/* We check both opposite sides at once, because with very small buttons, delta could be below max_delta for
-			 * the wrong side (that is, in horizontal case, the total width of two buttons can be below max_delta).
-			 * We rely on exact zero value here as an 'already processed' flag, so ensure we never actually
-			 * set a zero value at this stage. FLT_MIN is zero-enough for UI position computing. ;) */
+			/* We check both opposite sides at once, because with very small buttons,
+			 * delta could be below max_delta for the wrong side
+			 * (that is, in horizontal case, the total width of two buttons can be below max_delta).
+			 * We rely on exact zero value here as an 'already processed' flag,
+			 * so ensure we never actually set a zero value at this stage.
+			 * FLT_MIN is zero-enough for UI position computing. ;) */
 			delta = max_ff(fabsf(*butal->borders[side] - *butal_other->borders[side_opp]), FLT_MIN);
 			delta_side_opp = max_ff(fabsf(*butal->borders[side_opp] - *butal_other->borders[side]), FLT_MIN);
 			if (delta_side_opp < delta) {
@@ -178,18 +186,21 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
 			}
 
 			if (delta < max_delta) {
-				/* We are only interested in neighbors that are at least as close as already found ones. */
+				/* We are only interested in neighbors that are
+				 * at least as close as already found ones. */
 				if (delta <= butal->dists[side]) {
 					{
 						/* We found an as close or closer neighbor.
 						 * If both buttons are alignable, we set them as each other neighbors.
-						 * Else, we have an unalignable one, we need to reset the others matching neighbor to NULL
-						 * if its 'proximity distance' is really lower with current one.
+						 * Else, we have an unalignable one, we need to reset the others matching
+						 * neighbor to NULL if its 'proximity distance'
+						 * is really lower with current one.
 						 *
-						 * NOTE: We cannot only execute that piece of code in case we found a **closer** neighbor,
-						 *       due to the limited way we represent neighbors (buttons only know **one** neighbor
-						 *       on each side, when they can actually have several ones), it would prevent
-						 *       some buttons to be properly 'neighborly-initialized'. */
+						 * NOTE: We cannot only execute that piece of code in case we found a
+						 *       **closer** neighbor, due to the limited way we represent neighbors
+						 *       (buttons only know **one** neighbor on each side, when they can
+						 *       actually have several ones), it would prevent some buttons to be
+						 *       properly 'neighborly-initialized'. */
 						if (butal_can_align && butal_other_can_align) {
 							butal->neighbors[side] = butal_other;
 							butal_other->neighbors[side_opp] = butal;
@@ -217,10 +228,12 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
 							butal_other->neighbors[side_opp] = butal;
 						}
 
-						/* We have a pair of neighbors, we have to check whether we can stitch their matching corners.
+						/* We have a pair of neighbors, we have to check whether we
+						 *   can stitch their matching corners.
 						 *   E.g. if butal_other is on the left of butal (that is, side == LEFT),
-						 *        if both TOP (side_s1) coordinates of buttons are close enough, we can stitch
-						 *        their upper matching corners, and same for DOWN (side_s2) side. */
+						 *        if both TOP (side_s1) coordinates of buttons are close enough,
+						 *        we can stitch their upper matching corners,
+						 *        and same for DOWN (side_s2) side. */
 						delta = fabsf(*butal->borders[side_s1] - *butal_other->borders[side_s1]);
 						if (delta < max_delta) {
 							butal->flags[side_s1] |= stitch;
@@ -233,7 +246,8 @@ static void block_align_proximity_compute(ButAlign *butal, ButAlign *butal_other
 						}
 					}
 				}
-				/* We assume two buttons can only share one side at most - for until we have sperical UI... */
+				/* We assume two buttons can only share one side at most - for until
+				 * we have sperical UI... */
 				return;
 			}
 		}
@@ -329,9 +343,10 @@ static int ui_block_align_butal_cmp(const void *a, const void *b)
 		return (*butal->borders[LEFT] > *butal_other->borders[LEFT]) ? 1 : -1;
 	}
 
-	/* XXX We cannot actually assert here, since in some very compressed space cases, stupid UI code produces
-	 *     widgets which have the same TOP and LEFT positions...
-	 *     We do not care really, because this happens when UI is way too small to be usable anyway. */
+	/* XXX We cannot actually assert here, since in some very compressed space cases,
+	 *     stupid UI code produces widgets which have the same TOP and LEFT positions...
+	 *     We do not care really,
+	 *     because this happens when UI is way too small to be usable anyway. */
 	/* BLI_assert(0); */
 	return 0;
 }
@@ -423,27 +438,29 @@ void ui_block_align_calc(uiBlock *block, const ARegion *region)
 	}
 
 	/* This will give us ButAlign items regrouped by align group, vertical and horizontal location.
-	 * Note that, given how buttons are defined in UI code, butal_array shall already be "nearly sorted"... */
+	 * Note that, given how buttons are defined in UI code,
+	 * butal_array shall already be "nearly sorted"... */
 	qsort(butal_array, (size_t)num_buttons, sizeof(*butal_array), ui_block_align_butal_cmp);
 
-	/* Third loop: for each pair of buttons in the same align group, we compute their potential proximity.
-	 * Note that each pair is checked only once, and that we break early in case we know all remaining pairs will
-	 * always be too far away. */
+	/* Third loop: for each pair of buttons in the same align group,
+	 * we compute their potential proximity. Note that each pair is checked only once, and that we
+	 * break early in case we know all remaining pairs will always be too far away. */
 	for (i = 0, butal = butal_array; i < num_buttons; i++, butal++) {
 		const short alignnr = butal->but->alignnr;
 
 		for (j = i + 1, butal_other = &butal_array[i + 1]; j < num_buttons; j++, butal_other++) {
 			const float max_delta = MAX_DELTA;
 
-			/* Since they are sorted, buttons after current butal can only be of same or higher group, and once
-			 * they are not of same group, we know we can break this sub-loop and start checking with next butal. */
+			/* Since they are sorted, buttons after current butal can only be of same or higher
+			 * group, and once they are not of same group, we know we can break this sub-loop and
+			 * start checking with next butal. */
 			if (butal_other->but->alignnr != alignnr) {
 				break;
 			}
 
-			/* Since they are sorted vertically first, buttons after current butal can only be at same or lower height,
-			 * and once they are lower than a given threshold, we know we can break this sub-loop and
-			 * start checking with next butal. */
+			/* Since they are sorted vertically first, buttons after current butal can only be at
+			 * same or lower height, and once they are lower than a given threshold, we know we can
+			 * break this sub-loop and start checking with next butal. */
 			if ((*butal->borders[DOWN] - *butal_other->borders[TOP]) > max_delta) {
 				break;
 			}
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 4cd3acc7474..1ac5ce27b3e 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -216,7 +216,8 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str)
 	}
 
 	/* make sure we have animdata for this */
-	/* FIXME: until materials can be handled by depsgraph, don't allow drivers to be created for them */
+	/* FIXME: until materials can be handled by depsgraph,
+	 * don't allow drivers to be created for them */
 	id = (ID *)but->rnapoin.id.data;
 	if ((id == NULL) || (GS(id->name) == ID_MA) || (GS(id->name) == ID_TE)) {
 		if (G.debug & G_DEBUG)
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c
index 5ac45580b18..f71715fa700 100644
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@ -54,7 +54,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-/* This hack is needed because we don't have a good way to re-reference keymap items once added: T42944 */
+/* This hack is needed because we don't have a good way to
+ * re-reference keymap items once added: T42944 */
 #define USE_KEYMAP_ADD_HACK
 
 /* -------------------------------------------------------------------- */
@@ -135,7 +136,8 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *ar, void *arg)
 	IDProperty *prop = (but->opptr) ? but->opptr->data : NULL;
 	int kmi_id;
 
-	/* XXX this guess_opname can potentially return a different keymap than being found on adding later... */
+	/* XXX this guess_opname can potentially return a different keymap
+	 * than being found on adding later... */
 	km = WM_keymap_guess_opname(C, but->optype->idname);
 	kmi = WM_keymap_add_item(km, but->optype->idname, AKEY, KM_PRESS, 0, 0);
 	kmi_id = kmi->id;
@@ -407,7 +409,8 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
 		bool is_idprop = RNA_property_is_idprop(prop);
 		bool is_set = RNA_property_is_set(ptr, prop);
 
-		/* second slower test, saved people finding keyframe items in menus when its not possible */
+		/* second slower test,
+		 * saved people finding keyframe items in menus when its not possible */
 		if (is_anim)
 			is_anim = RNA_property_path_from_ID_check(&but->rnapoin, but->rnaprop);
 
@@ -418,7 +421,8 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
 		const int override_status = RNA_property_static_override_status(ptr, prop, -1);
 		const bool is_overridable = (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE) != 0;
 
-		/* Set the (button_pointer, button_prop) and pointer data for Python access to the hovered ui element. */
+		/* Set the (button_pointer, button_prop)
+		 * and pointer data for Python access to the hovered ui element. */
 		uiLayoutSetContextFromBut(layout, but);
 
 		/* Keyframes */
@@ -675,7 +679,8 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
 		}
 	}
 
-	/* Pointer properties and string properties with prop_search support jumping to target object/bone. */
+	/* Pointer properties and string properties with
+	 * prop_search support jumping to target object/bone. */
 	if (but->rnapoin.data && but->rnaprop) {
 		const PropertyType type = RNA_property_type(but->rnaprop);
 
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index ac1578d885d..dab8dd3d04b 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -547,7 +547,8 @@ void UI_draw_text_underline(int pos_x, int pos_y, int len, int height, const flo
 
 /* ************** SPECIAL BUTTON DRAWING FUNCTIONS ************* */
 
-/* based on UI_draw_roundbox_gl_mode, check on making a version which allows us to skip some sides */
+/* based on UI_draw_roundbox_gl_mode,
+ * check on making a version which allows us to skip some sides */
 void ui_draw_but_TAB_outline(const rcti *rect, float rad, uchar highlight[3], uchar highlight_fade[3])
 {
 	GPUVertFormat *format = immVertexFormat();
@@ -892,7 +893,8 @@ void ui_draw_but_WAVEFORM(ARegion *UNUSED(ar), uiBut *but, const uiWidgetColors
 	int scissor[4];
 	float colors[3][3];
 	float colorsycc[3][3] = {{1, 0, 1}, {1, 1, 0}, {0, 1, 1}};
-	float colors_alpha[3][3], colorsycc_alpha[3][3]; /* colors  pre multiplied by alpha for speed up */
+	/* colors  pre multiplied by alpha for speed up */
+	float colors_alpha[3][3], colorsycc_alpha[3][3];
 	float min, max;
 
 	if (scopes == NULL) return;
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index 781032ef971..33d69524b77 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -114,7 +114,8 @@ static int datadropper_init(bContext *C, wmOperator *op)
 	type = RNA_property_pointer_type(&ddr->ptr, ddr->prop);
 	ddr->idcode = RNA_type_to_ID_code(type);
 	BLI_assert(ddr->idcode != 0);
-	/* Note we can translate here (instead of on draw time), because this struct has very short lifetime. */
+	/* Note we can translate here (instead of on draw time),
+	 * because this struct has very short lifetime. */
 	ddr->idcode_name = TIP_(BKE_idcode_to_name(ddr->idcode));
 
 	PointerRNA ptr = RNA_property_pointer_get(&ddr->ptr, ddr->prop);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index e037692e3e8..86cc51712a9 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -229,10 +229,14 @@ typedef struct uiButMultiState {
 
 typedef struct uiHandleButtonMulti {
 	enum {
-		BUTTON_MULTI_INIT_UNSET = 0,    /* gesture direction unknown, wait until mouse has moved enough... */
-		BUTTON_MULTI_INIT_SETUP,        /* vertical gesture detected, flag buttons interactively (UI_BUT_DRAG_MULTI) */
-		BUTTON_MULTI_INIT_ENABLE,       /* flag buttons finished, apply horizontal motion to active and flagged */
-		BUTTON_MULTI_INIT_DISABLE,      /* vertical gesture _not_ detected, take no further action */
+		/** gesture direction unknown, wait until mouse has moved enough... */
+		BUTTON_MULTI_INIT_UNSET = 0,
+		/** vertical gesture detected, flag buttons interactively (UI_BUT_DRAG_MULTI) */
+		BUTTON_MULTI_INIT_SETUP,
+		/** flag buttons finished, apply horizontal motion to active and flagged */
+		BUTTON_MULTI_INIT_ENABLE,
+		/** vertical gesture _not_ detected, take no further action */
+		BUTTON_MULTI_INIT_DISABLE,
 	} init;
 
 	bool has_mbuts;  /* any buttons flagged UI_BUT_DRAG_MULTI */
@@ -241,11 +245,12 @@ typedef struct uiHandleButtonMulti {
 
 	bool is_proportional;
 
-	/* In some cases we directly apply the changes to multiple buttons, so we don't want to do it twice. */
+	/* In some cases we directly apply the changes to multiple buttons,
+	 * so we don't want to do it twice. */
 	bool skip;
 
-	/* before activating, we need to check gesture direction
-	 * accumulate signed cursor movement here so we can tell if this is a vertical motion or not. */
+	/* before activating, we need to check gesture direction accumulate signed cursor movement
+	 * here so we can tell if this is a vertical motion or not. */
 	float drag_dir[2];
 
 	/* values copied direct from event->x,y
@@ -323,8 +328,10 @@ typedef struct uiHandleButtonData {
 	CBData *dragcbd;
 
 #ifdef USE_CONT_MOUSE_CORRECT
-	/* when ungrabbing buttons which are #ui_but_is_cursor_warp(), we may want to position them
-	 * FLT_MAX signifies do-nothing, use #ui_block_to_window_fl() to get this into a usable space  */
+	/* when ungrabbing buttons which are #ui_but_is_cursor_warp(),
+	 * we may want to position them.
+	 * FLT_MAX signifies do-nothing, use #ui_block_to_window_fl()
+	 * to get this into a usable space. */
 	float ungrab_mval[2];
 #endif
 
@@ -1335,7 +1342,8 @@ static void ui_drag_toggle_set(bContext *C, uiDragToggleHandle *drag_info, const
 					BLI_rctf_cent_y(&but->rect),
 				};
 
-				/* check if this is a different button, chances are high the button wont move about :) */
+				/* check if this is a different button,
+				 * chances are high the button wont move about :) */
 				if (len_manhattan_v2v2(drag_info->but_cent_start, but_cent_new) > 1.0f) {
 					if (fabsf(drag_info->but_cent_start[0] - but_cent_new[0]) <
 					    fabsf(drag_info->but_cent_start[1] - but_cent_new[1]))
@@ -1596,18 +1604,22 @@ static void ui_selectcontext_apply(
 			RNA_property_int_range(&but->rnapoin, prop, &min.i, &max.i);
 		}
 		else if (rna_type == PROP_ENUM) {
-			delta.i = RNA_property_enum_get(&but->rnapoin, prop);  /* not a delta infact */
+			/* not a delta infact */
+			delta.i = RNA_property_enum_get(&but->rnapoin, prop);
 		}
 		else if (rna_type == PROP_BOOLEAN) {
 			if (is_array) {
-				delta.b = RNA_property_boolean_get_index(&but->rnapoin, prop, index);  /* not a delta infact */
+				/* not a delta infact */
+				delta.b = RNA_property_boolean_get_index(&but->rnapoin, prop, index);
 			}
 			else {
-				delta.b = RNA_property_boolean_get(&but->rnapoin, prop);  /* not a delta infact */
+				/* not a delta infact */
+				delta.b = RNA_property_boolean_get(&but->rnapoin, prop);
 			}
 		}
 		else if (rna_type == PROP_POINTER) {
-			delta.p = RNA_property_pointer_get(&but->rnapoin, prop);  /* not a delta infact */
+			/* not a delta infact */
+			delta.p = RNA_property_pointer_get(&but->rnapoin, prop);
 		}
 
 #ifdef USE_ALLSELECT_LAYER_HACK
@@ -3244,7 +3256,8 @@ static void ui_do_but_textedit(
 		{
 			bool had_selection = but->selsta != but->selend;
 
-			/* exit on LMB only on RELEASE for searchbox, to mimic other popups, and allow multiple menu levels */
+			/* exit on LMB only on RELEASE for searchbox, to mimic other popups,
+			 * and allow multiple menu levels */
 			if (data->searchbox)
 				inbox = ui_searchbox_inside(data->searchbox, event->x, event->y);
 
@@ -3282,7 +3295,8 @@ static void ui_do_but_textedit(
 				changed = true;
 			}
 			else if (inbox) {
-				/* if we allow activation on key press, it gives problems launching operators [#35713] */
+				/* if we allow activation on key press,
+				 * it gives problems launching operators T35713. */
 				if (event->val == KM_RELEASE) {
 					button_activate_state(C, but, BUTTON_STATE_EXIT);
 					retval = WM_UI_HANDLER_BREAK;
@@ -3741,7 +3755,8 @@ static bool ui_do_but_ANY_drag_toggle(
 		}
 	}
 	else if (data->state == BUTTON_STATE_WAIT_DRAG) {
-		/* note: the 'BUTTON_STATE_WAIT_DRAG' part of 'ui_do_but_EXIT' could be refactored into its own function */
+		/* note: the 'BUTTON_STATE_WAIT_DRAG' part of 'ui_do_but_EXIT' could be refactored into
+		 * its own function */
 		data->applied = false;
 		*r_retval = ui_do_but_EXIT(C, but, data, event);
 		return true;
@@ -4312,7 +4327,8 @@ static bool ui_numedit_but_NUM(
 		float non_linear_pixel_map;
 		float non_linear_scale;
 
-		/* Use a non-linear mapping of the mouse drag especially for large floats (normal behavior) */
+		/* Use a non-linear mapping of the mouse drag especially for large floats
+		 * (normal behavior) */
 		deler = 500;
 		if (is_float) {
 			/* not needed for smaller float buttons */
@@ -4454,8 +4470,10 @@ static int ui_do_but_NUM(
 		}
 
 		/* XXX hardcoded keymap check.... */
-		if (type == MOUSEPAN && event->alt)
-			retval = WM_UI_HANDLER_BREAK; /* allow accumulating values, otherwise scrolling gets preference */
+		if (type == MOUSEPAN && event->alt) {
+			/* allow accumulating values, otherwise scrolling gets preference */
+			retval = WM_UI_HANDLER_BREAK;
+		}
 		else if (type == WHEELDOWNMOUSE && event->ctrl) {
 			mx = but->rect.xmin;
 			but->drawflag &= ~UI_BUT_ACTIVE_RIGHT;
@@ -4756,8 +4774,10 @@ static int ui_do_but_SLI(
 		}
 
 		/* XXX hardcoded keymap check.... */
-		if (type == MOUSEPAN && event->alt)
-			retval = WM_UI_HANDLER_BREAK; /* allow accumulating values, otherwise scrolling gets preference */
+		if (type == MOUSEPAN && event->alt) {
+			/* allow accumulating values, otherwise scrolling gets preference */
+			retval = WM_UI_HANDLER_BREAK;
+		}
 		else if (type == WHEELDOWNMOUSE && event->ctrl) {
 			mx = but->rect.xmin;
 			click = 2;
@@ -4772,7 +4792,8 @@ static int ui_do_but_SLI(
 				retval = WM_UI_HANDLER_BREAK;
 			}
 #ifndef USE_ALLSELECT
-			/* alt-click on sides to get "arrows" like in UI_BTYPE_NUM buttons, and match wheel usage above */
+			/* alt-click on sides to get "arrows" like in UI_BTYPE_NUM buttons,
+			 * and match wheel usage above */
 			else if (event->type == LEFTMOUSE && event->alt) {
 				int halfpos = BLI_rctf_cent_x(&but->rect);
 				click = 2;
@@ -4877,7 +4898,8 @@ static int ui_do_but_SLI(
 
 #if 0
 			if (but->type == SLI) {
-				f = (float)(mx - but->rect.xmin) / (BLI_rctf_size_x(&but->rect)); /* same as below */
+				/* same as below */
+				f = (float)(mx - but->rect.xmin) / (BLI_rctf_size_x(&but->rect));
 			}
 			else
 #endif
@@ -6108,7 +6130,8 @@ static bool ui_numedit_but_CURVE(
 	int a;
 	bool changed = false;
 
-	/* evtx evty and drag coords are absolute mousecoords, prevents errors when editing when layout changes */
+	/* evtx evty and drag coords are absolute mousecoords,
+	 * prevents errors when editing when layout changes */
 	mx = evtx;
 	my = evty;
 	ui_window_to_block(data->region, block, &mx, &my);
@@ -6277,7 +6300,8 @@ static int ui_do_but_CURVE(
 
 						changed = true;
 
-						/* reset cmp back to the curve points again, rather than drawing segments */
+						/* reset cmp back to the curve points again,
+						 * rather than drawing segments */
 						cmp = cuma->curve;
 
 						/* find newly added point and make it 'sel' */
@@ -7197,7 +7221,8 @@ void UI_but_tooltip_refresh(bContext *C, uiBut *but)
 	}
 }
 
-/* removes tooltip timer from active but (meaning tooltip is disabled until it's reenabled again) */
+/* removes tooltip timer from active but
+ * (meaning tooltip is disabled until it's reenabled again) */
 void UI_but_tooltip_timer_remove(bContext *C, uiBut *but)
 {
 	uiHandleButtonData *data;
@@ -8005,7 +8030,8 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 				uiBut *but_other = ui_but_find_mouse_over(ar, event);
 				bool exit = false;
 
-				/* always deactivate button for pie menus, else moving to blank space will leave activated */
+				/* always deactivate button for pie menus,
+				 * else moving to blank space will leave activated */
 				if ((!ui_block_is_menu(block) || ui_block_is_pie_menu(block)) &&
 				    !ui_but_contains_point_px(ar, but, event->x, event->y))
 				{
@@ -8041,7 +8067,8 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 
 				break;
 			}
-			/* XXX hardcoded keymap check... but anyway, while view changes, tooltips should be removed */
+			/* XXX hardcoded keymap check... but anyway,
+			 * while view changes, tooltips should be removed */
 			case WHEELUPMOUSE:
 			case WHEELDOWNMOUSE:
 			case MIDDLEMOUSE:
@@ -8267,7 +8294,8 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar,
 			}
 
 			if (dyn_data->items_filter_neworder || dyn_data->items_filter_flags) {
-				/* If we have a display order different from collection order, we have some work! */
+				/* If we have a display order different from
+				 * collection order, we have some work! */
 				int *org_order = MEM_mallocN(dyn_data->items_shown * sizeof(int), __func__);
 				const int *new_order = dyn_data->items_filter_neworder;
 				int i, org_idx = -1, len = dyn_data->items_len;
@@ -9053,7 +9081,8 @@ static int ui_handle_menu_event(
 						}
 					}
 					else if (ELEM(event->val, KM_RELEASE, KM_CLICK)) {
-						/* For buttons that use a hold function, exit when mouse-up outside the menu. */
+						/* For buttons that use a hold function,
+						 * exit when mouse-up outside the menu. */
 						if (block->flag & UI_BLOCK_POPUP_HOLD) {
 							/* Note, we could check the cursor is over the parent button. */
 							menu->menuretval = UI_RETURN_CANCEL;
@@ -9306,7 +9335,8 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle
 	bool is_click_style;
 	float dist;
 
-	/* we block all events, this is modal interaction, except for drop events which is described below */
+	/* we block all events, this is modal interaction,
+	 * except for drop events which is described below */
 	int retval = WM_UI_HANDLER_BREAK;
 
 	if (event->type == EVT_DROP) {
@@ -9455,7 +9485,8 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle
 							block->pie_data.flags |= UI_PIE_DRAG_STYLE;
 						}
 
-						/* here instead, we use the offset location to account for the initial direction timeout */
+						/* here instead, we use the offset location to account for the initial
+						 * direction timeout */
 						if ((U.pie_menu_confirm > 0) &&
 						    (dist >= U.dpi_fac * (U.pie_menu_threshold + U.pie_menu_confirm)))
 						{
@@ -9573,7 +9604,8 @@ static int ui_handle_menus_recursive(
 		uiBlock *block = menu->region->uiblocks.first;
 		const bool is_menu = ui_block_is_menu(block);
 		bool inside = false;
-		/* root pie menus accept the key that spawned them as double click to improve responsiveness */
+		/* root pie menus accept the key that spawned
+		 * them as double click to improve responsiveness */
 		bool do_recursion = (!(block->flag & UI_BLOCK_RADIAL) || event->type != block->pie_data.event);
 
 		if (do_recursion) {
@@ -9773,7 +9805,8 @@ static int ui_handler_region_menu(bContext *C, const wmEvent *event, void *UNUSE
 		data = but->active;
 
 		if ((data->state == BUTTON_STATE_MENU_OPEN) &&
-		    (is_inside_menu == false) && /* make sure mouse isn't inside another menu (see T43247) */
+		    /* make sure mouse isn't inside another menu (see T43247) */
+		    (is_inside_menu == false) &&
 		    (ELEM(but->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER)) &&
 		    (but_other = ui_but_find_mouse_over(ar, event)) &&
 		    (but != but_other) &&
@@ -9837,7 +9870,8 @@ static int ui_popup_handler(bContext *C, const wmEvent *event, void *userdata)
 {
 	uiPopupBlockHandle *menu = userdata;
 	struct ARegion *menu_region;
-	/* we block all events, this is modal interaction, except for drop events which is described below */
+	/* we block all events, this is modal interaction,
+	 * except for drop events which is described below */
 	int retval = WM_UI_HANDLER_BREAK;
 	bool reset_pie = false;
 
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index eb35f69b627..f3bb61cdd3d 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -709,7 +709,10 @@ static void init_internal_icons(void)
 
 		if (icondir) {
 			BLI_join_dirfile(iconfilestr, sizeof(iconfilestr), icondir, btheme->tui.iconfile);
-			bbuf = IMB_loadiffname(iconfilestr, IB_rect, NULL); /* if the image is missing bbuf will just be NULL */
+
+			/* if the image is missing bbuf will just be NULL */
+			bbuf = IMB_loadiffname(iconfilestr, IB_rect, NULL);
+
 			if (bbuf && (bbuf->x < ICON_IMAGE_W || bbuf->y < ICON_IMAGE_H)) {
 				printf("\n***WARNING***\nIcons file %s too small.\nUsing built-in Icons instead\n", iconfilestr);
 				IMB_freeImBuf(bbuf);
@@ -1520,7 +1523,8 @@ static void icon_draw_size(
 	}
 	else if (di->type == ICON_TYPE_GEOM) {
 #ifdef USE_UI_TOOLBAR_HACK
-		/* TODO(campbell): scale icons up for toolbar, we need a way to detect larger buttons and do this automatic. */
+		/* TODO(campbell): scale icons up for toolbar,
+		 * we need a way to detect larger buttons and do this automatic. */
 		{
 			float scale = (float)ICON_DEFAULT_HEIGHT_TOOLBAR / (float)ICON_DEFAULT_HEIGHT;
 			y = (y + (h / 2)) - ((h * scale) / 2);
@@ -1615,7 +1619,8 @@ static void icon_draw_size(
 static void ui_id_preview_image_render_size(
         const bContext *C, Scene *scene, ID *id, PreviewImage *pi, int size, const bool use_job)
 {
-	if (((pi->flag[size] & PRV_CHANGED) || !pi->rect[size])) { /* changed only ever set by dynamic icons */
+	/* changed only ever set by dynamic icons */
+	if (((pi->flag[size] & PRV_CHANGED) || !pi->rect[size])) {
 		/* create the rect if necessary */
 		icon_set_image(C, scene, id, pi, size, use_job);
 
@@ -1628,10 +1633,14 @@ void UI_id_icon_render(const bContext *C, Scene *scene, ID *id, const bool big,
 	PreviewImage *pi = BKE_previewimg_id_ensure(id);
 
 	if (pi) {
-		if (big)
-			ui_id_preview_image_render_size(C, scene, id, pi, ICON_SIZE_PREVIEW, use_job);  /* bigger preview size */
-		else
-			ui_id_preview_image_render_size(C, scene, id, pi, ICON_SIZE_ICON, use_job);     /* icon size */
+		if (big) {
+			/* bigger preview size */
+			ui_id_preview_image_render_size(C, scene, id, pi, ICON_SIZE_PREVIEW, use_job);
+		}
+		else {
+			/* icon size */
+			ui_id_preview_image_render_size(C, scene, id, pi, ICON_SIZE_ICON, use_job);
+		}
 	}
 }
 
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 0a69ff6e38b..20671ae8162 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -106,7 +106,8 @@ typedef enum {
 } uiWidgetTypeEnum;
 
 #define UI_MENU_WIDTH_MIN       (UI_UNIT_Y * 9)
-#define UI_MENU_SUBMENU_PADDING (6 * UI_DPI_FAC) /* some extra padding added to menus containing submenu icons */
+/* some extra padding added to menus containing submenu icons */
+#define UI_MENU_SUBMENU_PADDING (6 * UI_DPI_FAC)
 
 /* menu scrolling */
 #define UI_MENU_SCROLL_ARROW	12
@@ -181,13 +182,20 @@ extern const short ui_radial_dir_to_angle[8];
 
 /* PieMenuData->flags */
 enum {
-	UI_PIE_DEGREES_RANGE_LARGE  = (1 << 0),  /* pie menu item collision is detected at 90 degrees */
-	UI_PIE_INITIAL_DIRECTION    = (1 << 1),  /* use initial center of pie menu to calculate direction */
-	UI_PIE_DRAG_STYLE           = (1 << 2),  /* pie menu is drag style */
-	UI_PIE_INVALID_DIR          = (1 << 3),  /* mouse not far enough from center position  */
-	UI_PIE_CLICK_STYLE          = (1 << 4),  /* pie menu changed to click style, click to confirm  */
-	UI_PIE_ANIMATION_FINISHED   = (1 << 5),  /* pie animation finished, do not calculate any more motion  */
-	UI_PIE_GESTURE_END_WAIT     = (1 << 6),  /* pie gesture selection has been done, now wait for mouse motion to end */
+	/** pie menu item collision is detected at 90 degrees */
+	UI_PIE_DEGREES_RANGE_LARGE  = (1 << 0),
+	/** use initial center of pie menu to calculate direction */
+	UI_PIE_INITIAL_DIRECTION    = (1 << 1),
+	/** pie menu is drag style */
+	UI_PIE_DRAG_STYLE           = (1 << 2),
+	/** mouse not far enough from center position  */
+	UI_PIE_INVALID_DIR          = (1 << 3),
+	/** pie menu changed to click style, click to confirm  */
+	UI_PIE_CLICK_STYLE          = (1 << 4),
+	/** pie animation finished, do not calculate any more motion  */
+	UI_PIE_ANIMATION_FINISHED   = (1 << 5),
+	/** pie gesture selection has been done, now wait for mouse motion to end */
+	UI_PIE_GESTURE_END_WAIT     = (1 << 6),
 };
 
 #define PIE_CLICK_THRESHOLD_SQ 50.0f
@@ -256,7 +264,7 @@ struct uiBut {
 	void *rename_arg1;
 	void *rename_orig;
 
-	/* Run an action when holding the button down. */
+	/** Run an action when holding the button down. */
 	uiButHandleHoldFunc hold_func;
 	void *hold_argN;
 
@@ -264,14 +272,18 @@ struct uiBut {
 	uiButToolTipFunc tip_func;
 	void *tip_argN;
 
-	/* info on why button is disabled, displayed in tooltip */
+	/** info on why button is disabled, displayed in tooltip */
 	const char *disabled_info;
 
 	BIFIconID icon;
-	char dt; /* drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied from the block */
-	signed char pie_dir; /* direction in a pie menu, used for collision detection (RadialDirection) */
-	bool changed; /* could be made into a single flag */
-	uchar unit_type; /* so buttons can support unit systems which are not RNA */
+	/** drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied from the block */
+	char dt;
+	/** direction in a pie menu, used for collision detection (RadialDirection) */
+	signed char pie_dir;
+	/** could be made into a single flag */
+	bool changed;
+	/** so buttons can support unit systems which are not RNA */
+	uchar unit_type;
 	short modifier_key;
 	short iconadd;
 
@@ -336,7 +348,7 @@ typedef struct ColorPickerData {
 } ColorPickerData;
 
 struct PieMenuData {
-	/* store title and icon to allow access when pie levels are created */
+	/** store title and icon to allow access when pie levels are created */
 	const char *title;
 	int icon;
 
@@ -346,13 +358,14 @@ struct PieMenuData {
 	float last_pos[2];
 	double duration_gesture;
 	int flags;
-	int event; /* initial event used to fire the pie menu, store here so we can query for release */
+	/** initial event used to fire the pie menu, store here so we can query for release */
+	int event;
 	float alphafac;
 };
 
 /* uiBlock.content_hints */
 enum eBlockContentHints {
-	/* In a menu block, if there is a single sub-menu button, we add some
+	/** In a menu block, if there is a single sub-menu button, we add some
 	 * padding to the right to put nicely aligned triangle icons there. */
 	UI_BLOCK_CONTAINS_SUBMENU_BUT = (1 << 0),
 };
@@ -403,14 +416,16 @@ struct uiBlock {
 
 	int flag;
 	short alignnr;
-	/* Hints about the buttons of this block. Used to avoid iterating over
+	/** Hints about the buttons of this block. Used to avoid iterating over
 	 * buttons to find out if some criteria is met by any. Instead, check this
 	 * criteria when adding the button and set a flag here if it's met. */
 	short content_hints; /* eBlockContentHints */
 
 	char direction;
-	char theme_style; /* UI_BLOCK_THEME_STYLE_* */
-	char dt; /* drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied to buttons */
+	/** UI_BLOCK_THEME_STYLE_* */
+	char theme_style;
+	/** drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied to buttons */
+	char dt;
 	bool auto_open;
 	char _pad[5];
 	double auto_open_last;
@@ -418,32 +433,46 @@ struct uiBlock {
 	const char *lockstr;
 
 	char lock;
-	char active;                /* to keep blocks while drawing and free them afterwards */
-	char tooltipdisabled;       /* to avoid tooltip after click */
-	char endblock;              /* UI_block_end done? */
-
-	eBlockBoundsCalc bounds_type;  /* for doing delayed */
+	/** to keep blocks while drawing and free them afterwards */
+	char active;
+	/** to avoid tooltip after click */
+	char tooltipdisabled;
+	/** UI_block_end done? */
+	char endblock;
+
+	/** for doing delayed */
+	eBlockBoundsCalc bounds_type;
 	int mx, my;
-	int bounds, minbounds;      /* for doing delayed */
+	/** for doing delayed */
+	int bounds, minbounds;
 
-	rctf safety;                /* pulldowns, to detect outside, can differ per case how it is created */
-	ListBase saferct;           /* uiSafetyRct list */
+	/** pulldowns, to detect outside, can differ per case how it is created */
+	rctf safety;
+	/** uiSafetyRct list */
+	ListBase saferct;
 
 	uiPopupBlockHandle *handle; /* handle */
 
-	struct wmOperator *ui_operator; /* use so presets can find the operator, */
-	                                /* across menus and from nested popups which fail for operator context. */
+	/** use so presets can find the operator,
+	 * across menus and from nested popups which fail for operator context. */
+	struct wmOperator *ui_operator;
 
-	void *evil_C;               /* XXX hack for dynamic operator enums */
+	/** XXX hack for dynamic operator enums */
+	void *evil_C;
 
-	struct UnitSettings *unit;  /* unit system, used a lot for numeric buttons so include here rather then fetching through the scene every time. */
-	ColorPickerData color_pickers; /* XXX, only accessed by color picker templates */
+	/** unit system, used a lot for numeric buttons so include here
+	 * rather then fetching through the scene every time. */
+	struct UnitSettings *unit;
+	/** \note only accessed by color picker templates. */
+	ColorPickerData color_pickers;
 
 	bool is_color_gamma_picker; /* Block for color picker with gamma baked in. */
 
-	char display_device[64]; /* display device name used to display this block,
-	                          * used by color widgets to transform colors from/to scene linear
-	                          */
+	/** display device name used to display this block,
+	 * used by color widgets to transform colors from/to scene linear
+	 */
+	char display_device[64];
+
 	struct PieMenuData pie_data;
 };
 
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 09033a5f56d..6cd2ba0b924 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -158,7 +158,7 @@ struct uiLayout {
 	bContextStore *context;
 	ListBase items;
 
-	/* Sub layout to add child items, if not the layout itself. */
+	/** Sub layout to add child items, if not the layout itself. */
 	uiLayout *child_items_layout;
 
 	int x, y, w, h;
@@ -169,10 +169,12 @@ struct uiLayout {
 	bool enabled;
 	bool redalert;
 	bool keepaspect;
-	bool variable_size;  /* For layouts inside gridflow, they and their items shall never have a fixed maximal size. */
+	/** For layouts inside gridflow, they and their items shall never have a fixed maximal size. */
+	bool variable_size;
 	char alignment;
 	char emboss;
-	float units[2];  /* for fixed width or height to avoid UI size changes */
+	/** for fixed width or height to avoid UI size changes */
+	float units[2];
 };
 
 typedef struct uiLayoutItemFlow {
@@ -188,9 +190,12 @@ typedef struct uiLayoutItemGridFlow {
 	bool row_major;     /* Fill first row first, instead of filling first column first. */
 	bool even_columns;  /* Same width for all columns. */
 	bool even_rows;     /* Same height for all rows. */
-	/* If positive, absolute fixed number of columns.
-	 * If 0, fully automatic (based on available width).
-	 * If negative, automatic but only generates number of columns/rows multiple of given (absolute) value. */
+	/**
+	 * - If positive, absolute fixed number of columns.
+	 * - If 0, fully automatic (based on available width).
+	 * - If negative, automatic but only generates number of columns/rows
+	 *   multiple of given (absolute) value.
+	 */
 	int columns_len;
 
 	/* Pure internal runtime storage. */
@@ -274,8 +279,9 @@ static int ui_layout_vary_direction(uiLayout *layout)
 
 static bool ui_layout_variable_size(uiLayout *layout)
 {
-	/* Note that this code is probably a bit flacky, we'd probably want to know whether it's variable in X and/or Y,
-	 * etc. But for now it mimics previous one, with addition of variable flag set for children of gridflow layouts. */
+	/* Note that this code is probably a bit flacky, we'd probably want to know whether it's
+	 * variable in X and/or Y, etc. But for now it mimics previous one,
+	 * with addition of variable flag set for children of gridflow layouts. */
 	return ui_layout_vary_direction(layout) == UI_ITEM_VARY_X || layout->variable_size;
 }
 
@@ -697,7 +703,8 @@ static void ui_item_enum_expand_exec(
 
 			/* Separate items, potentially with a label. */
 			if (next_item->identifier) {
-				/* Item without identifier but with name: Add group label for the following items. */
+				/* Item without identifier but with name:
+				 * Add group label for the following items. */
 				if (item->name) {
 					if (!is_first) {
 						uiItemS(block->curlayout);
@@ -735,7 +742,8 @@ static void ui_item_enum_expand_exec(
 		if (uiLayoutGetLocalDir(layout) != UI_LAYOUT_HORIZONTAL)
 			but->drawflag |= UI_BUT_TEXT_LEFT;
 
-		/* Allow quick, inaccurate swipe motions to switch tabs (no need to keep cursor over them). */
+		/* Allow quick, inaccurate swipe motions to switch tabs
+		 * (no need to keep cursor over them). */
 		if (but_type == UI_BTYPE_TAB) {
 			but->flag |= UI_BUT_DRAG_LOCK;
 		}
@@ -806,7 +814,8 @@ static uiBut *ui_item_with_label(
 		}
 		else {
 			if (ui_layout_variable_size(layout)) {
-				/* w_hint is width for label in this case. Use a default width for property button(s) */
+				/* w_hint is width for label in this case.
+				 * Use a default width for property button(s) */
 				prop_but_width = UI_UNIT_X * 5;
 				w_label = w_hint;
 			}
@@ -1253,7 +1262,8 @@ void uiItemsFullEnumO_items(
 					but = block->buttons.last;
 				}
 				else {
-					/* Do not use uiItemL here, as our root layout is a menu one, it will add a fake blank icon! */
+					/* Do not use uiItemL here, as our root layout is a menu one,
+					 * it will add a fake blank icon! */
 					but = uiDefBut(
 					        block, UI_BTYPE_LABEL, 0, item->name, 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL,
 					        0.0, 0.0, 0, 0, "");
@@ -1262,7 +1272,8 @@ void uiItemsFullEnumO_items(
 			}
 			else {
 				if (radial) {
-					/* invisible dummy button to ensure all items are always at the same position */
+					/* invisible dummy button to ensure all items are
+					 * always at the same position */
 					uiItemS(target);
 				}
 				else {
@@ -1751,7 +1762,8 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 			if ((type == PROP_ENUM) && (flag & UI_ITEM_R_EXPAND)) {
 				/* Expanded enums each have their own name. */
 
-				/* Often expanded enum's are better arranged into a row, so check the existing layout. */
+				/* Often expanded enum's are better arranged into a row,
+				 * so check the existing layout. */
 				if (uiLayoutGetLocalDir(layout) == UI_LAYOUT_HORIZONTAL) {
 					layout = uiLayoutRow(layout_split, true);
 				}
@@ -2106,7 +2118,8 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
 		but->free_search_arg = true;
 	}
 	else if (but->type == UI_BTYPE_SEARCH_MENU) {
-		/* In case we fail to find proper searchprop, so other code might have already set but->type to search menu... */
+		/* In case we fail to find proper searchprop,
+		 * so other code might have already set but->type to search menu... */
 		but->flag |= UI_BUT_DISABLED;
 	}
 }
@@ -2262,7 +2275,8 @@ static uiBut *ui_item_menu(
 	}
 
 	if (ELEM(layout->root->type, UI_LAYOUT_PANEL, UI_LAYOUT_TOOLBAR) ||
-	    (force_menu && layout->root->type != UI_LAYOUT_MENU))  /* We never want a dropdown in menu! */
+	    /* We never want a dropdown in menu! */
+	    (force_menu && layout->root->type != UI_LAYOUT_MENU))
 	{
 		UI_but_type_set_menu_from_pulldown(but);
 	}
@@ -3182,7 +3196,8 @@ typedef struct UILayoutGridFlowInput {
 	const bool even_rows : 1;  /* All rows will have same height. */
 	const int space_x;  /* Space between columns. */
 	const int space_y;  /* Space between rows. */
-	/* Real data about current position and size of this layout item (either estimated, or final values). */
+	/* Real data about current position and size of this layout item
+	 * (either estimated, or final values). */
 	const int litem_w;  /* Layout item width. */
 	const int litem_x;  /* Layout item X position. */
 	const int litem_y;  /* Layout item Y position. */
@@ -3430,7 +3445,8 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem)
 			}
 		}
 
-		/* Set evenly-spaced axes size (quick optimization in case we have even columns and rows). */
+		/* Set evenly-spaced axes size
+		 * (quick optimization in case we have even columns and rows). */
 		if (gflow->even_columns && gflow->even_rows) {
 			litem->w = (int)(gflow->tot_columns * avg_w) + space_x * (gflow->tot_columns - 1);
 			litem->h = (int)(gflow->tot_rows * max_h) + space_y * (gflow->tot_rows - 1);
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 484debf554c..31ae3bc7b4b 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -444,7 +444,8 @@ static int override_type_set_button_exec(bContext *C, wmOperator *op)
 			operation = IDOVERRIDESTATIC_OP_REPLACE;
 			break;
 		case UIOverride_Type_Difference:
-			operation = IDOVERRIDESTATIC_OP_ADD;  /* override code will automatically switch to subtract if needed. */
+			/* override code will automatically switch to subtract if needed. */
+			operation = IDOVERRIDESTATIC_OP_ADD;
 			break;
 		case UIOverride_Type_Factor:
 			operation = IDOVERRIDESTATIC_OP_MULTIPLY;
@@ -549,13 +550,15 @@ static int override_remove_button_exec(bContext *C, wmOperator *op)
 
 	if (!all && index != -1) {
 		bool is_strict_find;
-		/* Remove override operation for given item, add singular operations for the other items as needed. */
+		/* Remove override operation for given item,
+		 * add singular operations for the other items as needed. */
 		IDOverrideStaticPropertyOperation *opop = BKE_override_static_property_operation_find(
 		        oprop, NULL, NULL, index, index, false, &is_strict_find);
 		BLI_assert(opop != NULL);
 		if (!is_strict_find) {
 			/* No specific override operation, we have to get generic one,
-			 * and create item-specific override operations for all but given index, before removing generic one. */
+			 * and create item-specific override operations for all but given index,
+			 * before removing generic one. */
 			for (int idx = RNA_property_array_length(&ptr, prop); idx--; ) {
 				if (idx != index) {
 					BKE_override_static_property_operation_get(oprop, opop->operation, NULL, NULL, idx, idx, true, NULL, NULL);
@@ -735,7 +738,8 @@ bool UI_context_copy_to_selected_list(
 		}
 		else if (GS(id->name) == ID_SCE) {
 			/* Sequencer's ID is scene :/ */
-			/* Try to recursively find an RNA_Sequence ancestor, to handle situations like T41062... */
+			/* Try to recursively find an RNA_Sequence ancestor,
+			 * to handle situations like T41062... */
 			if ((*r_path = RNA_path_resolve_from_type_to_property(ptr, prop, &RNA_Sequence)) != NULL) {
 				*r_lb = CTX_data_collection_get(C, "selected_editable_sequences");
 			}
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index c53aadefc20..1720eec8277 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -28,7 +28,8 @@
  */
 
 
-/* a full doc with API notes can be found in bf-blender/trunk/blender/doc/guides/interface_API.txt */
+/* a full doc with API notes can be found in
+ * bf-blender/trunk/blender/doc/guides/interface_API.txt */
 
 #include <math.h>
 #include <stdlib.h>
@@ -1872,8 +1873,10 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 	const int px_x_sign = is_left ? px : -px;
 	const int category_tabs_width = round_fl_to_int(UI_PANEL_CATEGORY_MARGIN_WIDTH * zoom);
 	const float dpi_fac = UI_DPI_FAC;
-	const int tab_v_pad_text = round_fl_to_int((2 + ((px * 3) * dpi_fac)) * zoom);  /* padding of tabs around text */
-	const int tab_v_pad = round_fl_to_int((4 + (2 * px * dpi_fac)) * zoom);  /* padding between tabs */
+	/* padding of tabs around text */
+	const int tab_v_pad_text = round_fl_to_int((2 + ((px * 3) * dpi_fac)) * zoom);
+	/* padding between tabs */
+	const int tab_v_pad = round_fl_to_int((4 + (2 * px * dpi_fac)) * zoom);
 	const float tab_curve_radius = ((px * 3) * dpi_fac) * zoom;
 	/* We flip the tab drawing, so always use these flags. */
 	const int roundboxtype = UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT;
@@ -2153,7 +2156,8 @@ static int ui_handle_panel_category_cycling(const wmEvent *event, ARegion *ar, c
 					const bool backwards = event->shift;
 					pc_dyn = backwards ? pc_dyn->prev : pc_dyn->next;
 					if (!pc_dyn) {
-						/* proper cyclic behavior, back to first/last category (only used for ctrl+tab) */
+						/* proper cyclic behavior,
+						 * back to first/last category (only used for ctrl+tab) */
 						pc_dyn = backwards ? ar->panels_category.last : ar->panels_category.first;
 					}
 				}
@@ -2225,10 +2229,13 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar, cons
 		/* checks for mouse position inside */
 		pa = block->panel;
 
-		if (!pa || pa->paneltab != NULL)
+		if (!pa || pa->paneltab != NULL) {
 			continue;
-		if (pa->type && pa->type->flag & PNL_NO_HEADER)  /* XXX - accessed freed panels when scripts reload, need to fix. */
+		}
+		/* XXX - accessed freed panels when scripts reload, need to fix. */
+		if (pa->type && pa->type->flag & PNL_NO_HEADER) {
 			continue;
+		}
 
 		mouse_state = ui_panel_mouse_state_get(block, pa, mx, my);
 
diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.c
index 819fbc874d3..b084d66d6c6 100644
--- a/source/blender/editors/interface/interface_region_color_picker.c
+++ b/source/blender/editors/interface/interface_region_color_picker.c
@@ -175,7 +175,8 @@ static void ui_update_color_picker_buts_rgb(
 	}
 	ui_rgb_to_color_picker_compat_v(tmp, hsv);
 
-	/* this updates button strings, is hackish... but button pointers are on stack of caller function */
+	/* this updates button strings,
+	 * is hackish... but button pointers are on stack of caller function */
 	for (bt = block->buttons.first; bt; bt = bt->next) {
 		if (bt->custom_data != cpicker)
 			continue;
@@ -193,7 +194,8 @@ static void ui_update_color_picker_buts_rgb(
 			double intpart;
 			char col[16];
 
-			/* Hex code is assumed to be in sRGB space (coming from other applications, web, etc) */
+			/* Hex code is assumed to be in sRGB space
+			 * (coming from other applications, web, etc) */
 			copy_v3_v3(rgb_hex, rgb);
 			if (from_but && !ui_but_is_color_gamma(from_but)) {
 				IMB_colormanagement_scene_linear_to_srgb_v3(rgb_hex);
diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c
index 44effc8c097..eae2b01d370 100644
--- a/source/blender/editors/interface/interface_region_menu_pie.c
+++ b/source/blender/editors/interface/interface_region_menu_pie.c
@@ -126,7 +126,8 @@ uiPieMenu *UI_pie_menu_begin(struct bContext *C, const char *title, int icon, co
 	pie->block_radial->puphash = ui_popup_menu_hash(title);
 	pie->block_radial->flag |= UI_BLOCK_RADIAL;
 
-	/* if pie is spawned by a left click, release or click event, it is always assumed to be click style */
+	/* if pie is spawned by a left click, release or click event,
+	 * it is always assumed to be click style */
 	if (event->type == LEFTMOUSE || ELEM(event->val, KM_RELEASE, KM_CLICK)) {
 		pie->block_radial->pie_data.flags |= UI_PIE_CLICK_STYLE;
 		pie->block_radial->pie_data.event = EVENT_NONE;
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index e136614d30e..da5bd3062e6 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -393,7 +393,8 @@ uiPopupMenu *UI_popup_menu_begin_ex(bContext *C, const char *title, const char *
 	pup->layout = UI_block_layout(pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 0, 0, 200, 0, MENU_PADDING, style);
 
 	/* note, this intentionally differs from the menu & submenu default because many operators
-	 * use popups like this to select one of their options - where having invoke doesn't make sense */
+	 * use popups like this to select one of their options -
+	 * where having invoke doesn't make sense */
 	uiLayoutSetOperatorContext(pup->layout, WM_OP_EXEC_REGION_WIN);
 
 	/* create in advance so we can let buttons point to retval already */
@@ -640,7 +641,8 @@ void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block)
 			UI_popup_handlers_remove(&win->modalhandlers, block->handle);
 			ui_popup_block_free(C, block->handle);
 
-			/* In the case we have nested popups, closing one may need to redraw another, see: T48874 */
+			/* In the case we have nested popups,
+			 * closing one may need to redraw another, see: T48874 */
 			for (ARegion *ar = screen->regionbase.first; ar; ar = ar->next) {
 				ED_region_tag_refresh_ui(ar);
 			}
diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c
index cb4939adc56..e5607f6d7aa 100644
--- a/source/blender/editors/interface/interface_region_popover.c
+++ b/source/blender/editors/interface/interface_region_popover.c
@@ -165,7 +165,8 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v
 		if (!handle->refresh) {
 			float center[2] = {BLI_rctf_cent_x(&pup->but->rect), BLI_rctf_cent_y(&pup->but->rect)};
 			ui_block_to_window_fl(handle->ctx_region, pup->but->block, &center[0], &center[1]);
-			/* These variables aren't used for popovers, we could add new variables if there is a conflict. */
+			/* These variables aren't used for popovers,
+			 * we could add new variables if there is a conflict. */
 			handle->prev_mx = block->mx = (int)center[0];
 			handle->prev_my = block->my = (int)center[1];
 		}
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c
index d6e1fcdea24..9091bb1c3d9 100644
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@ -90,10 +90,14 @@ typedef struct uiSearchboxData {
 	rcti bbox;
 	uiFontStyle fstyle;
 	uiSearchItems items;
-	int active;     /* index in items array */
-	bool noback;    /* when menu opened with enough space for this */
-	bool preview;   /* draw thumbnail previews, rather than list */
-	bool use_sep;   /* use the UI_SEP_CHAR char for splitting shortcuts (good for operators, bad for data) */
+	/** index in items array */
+	int active;
+	/** when menu opened with enough space for this */
+	bool noback;
+	/** draw thumbnail previews, rather than list */
+	bool preview;
+	/** use the UI_SEP_CHAR char for splitting shortcuts (good for operators, bad for data) */
+	bool use_sep;
 	int prv_rows, prv_cols;
 } uiSearchboxData;
 
@@ -262,7 +266,8 @@ bool ui_searchbox_apply(uiBut *but, ARegion *ar)
 		return true;
 	}
 	else if (but->flag & UI_BUT_VALUE_CLEAR) {
-		/* It is valid for _VALUE_CLEAR flavor to have no active element (it's a valid way to unlink). */
+		/* It is valid for _VALUE_CLEAR flavor to have no active element
+		 * (it's a valid way to unlink). */
 		but->editstr[0] = '\0';
 
 		return true;
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index 94bed87b40b..b4df8d237e0 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -520,7 +520,8 @@ void uiStyleInit(void)
 	}
 #endif
 
-	/* XXX, this should be moved into a style, but for now best only load the monospaced font once. */
+	/* XXX, this should be moved into a style,
+	 * but for now best only load the monospaced font once. */
 	BLI_assert(blf_mono_font == -1);
 	if (U.font_path_ui_mono[0]) {
 		blf_mono_font = BLF_load_unique(U.font_path_ui_mono);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 7cf68a144b2..ed3e2e863b7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -129,8 +129,12 @@ static void template_add_button_search_menu(
 		ARegion *region = CTX_wm_region(C);
 		ScrArea *area = CTX_wm_area(C);
 		/* XXX ugly top-bar exception */
-		const bool use_big_size = (region->regiontype != RGN_TYPE_HEADER) && (area->spacetype != SPACE_TOPBAR); /* silly check, could be more generic */
-		/* Ugly exception for screens here, drawing their preview in icon size looks ugly/useless */
+		const bool use_big_size = (
+		        /* silly check, could be more generic */
+		        (region->regiontype != RGN_TYPE_HEADER) &&
+		        (area->spacetype != SPACE_TOPBAR));
+		/* Ugly exception for screens here,
+		 * drawing their preview in icon size looks ugly/useless */
 		const bool use_preview_icon = use_big_size || (id && (GS(id->name) != ID_SCR));
 		const short width = UI_UNIT_X * (use_big_size ? 6 : 1.6f);
 		const short height = UI_UNIT_Y * (use_big_size ? 6 : 1);
@@ -1048,7 +1052,9 @@ void uiTemplateAnyID(
 	}
 
 	/* Start drawing UI Elements using standard defines */
-	split = uiLayoutSplit(layout, 0.33f, false);  /* NOTE: split amount here needs to be synced with normal labels */
+
+	/* NOTE: split amount here needs to be synced with normal labels */
+	split = uiLayoutSplit(layout, 0.33f, false);
 
 	/* FIRST PART ................................................ */
 	row = uiLayoutRow(split, false);
@@ -1066,14 +1072,20 @@ void uiTemplateAnyID(
 	row = uiLayoutRow(split, true);
 
 	/* ID-Type Selector - just have a menu of icons */
-	sub = uiLayoutRow(row, true);                     /* HACK: special group just for the enum, otherwise we */
-	uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_LEFT);  /*       we get ugly layout with text included too...  */
+
+	/* HACK: special group just for the enum,
+	 * otherwise we get ugly layout with text included too... */
+	sub = uiLayoutRow(row, true);
+	uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_LEFT);
 
 	uiItemFullR(sub, ptr, propType, 0, 0, UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 
 	/* ID-Block Selector - just use pointer widget... */
-	sub = uiLayoutRow(row, true);                       /* HACK: special group to counteract the effects of the previous */
-	uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_EXPAND);  /*       enum, which now pushes everything too far right         */
+
+	/* HACK: special group to counteract the effects of the previous enum,
+	 * which now pushes everything too far right. */
+	sub = uiLayoutRow(row, true);
+	uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_EXPAND);
 
 	uiItemFullR(sub, ptr, propID, 0, 0, 0, "", ICON_NONE);
 }
@@ -1312,7 +1324,8 @@ void uiTemplatePathBuilder(
 	/* Path (existing string) Widget */
 	uiItemR(row, ptr, propname, 0, text, ICON_RNA);
 
-	/* TODO: attach something to this to make allow searching of nested properties to 'build' the path */
+	/* TODO: attach something to this to make allow
+	 * searching of nested properties to 'build' the path */
 }
 
 /************************ Modifier Template *************************/
@@ -1350,7 +1363,8 @@ static int modifier_can_delete(ModifierData *md)
 	return 1;
 }
 
-/* Check whether Modifier is a simulation or not, this is used for switching to the physics/particles context tab */
+/* Check whether Modifier is a simulation or not,
+ * this is used for switching to the physics/particles context tab */
 static int modifier_is_simulation(ModifierData *md)
 {
 	/* Physic Tab */
@@ -1477,7 +1491,8 @@ static uiLayout *draw_modifier(
 		UI_block_align_end(block);
 
 		UI_block_emboss_set(block, UI_EMBOSS_NONE);
-		/* When Modifier is a simulation, show button to switch to context rather than the delete button. */
+		/* When Modifier is a simulation,
+		 * show button to switch to context rather than the delete button. */
 		if (modifier_can_delete(md) &&
 		    !modifier_is_simulation(md))
 		{
@@ -1542,7 +1557,8 @@ static uiLayout *draw_modifier(
 			}
 		}
 
-		/* result is the layout block inside the box, that we return so that modifier settings can be drawn */
+		/* result is the layout block inside the box,
+		 * that we return so that modifier settings can be drawn */
 		result = uiLayoutColumn(box, false);
 		block = uiLayoutAbsoluteBlock(box);
 	}
@@ -1679,7 +1695,8 @@ static uiLayout *gpencil_draw_modifier(
 		uiItemO(row, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy"), ICON_NONE,
 		        "OBJECT_OT_gpencil_modifier_copy");
 
-		/* result is the layout block inside the box, that we return so that modifier settings can be drawn */
+		/* result is the layout block inside the box,
+		 * that we return so that modifier settings can be drawn */
 		result = uiLayoutColumn(box, false);
 		block = uiLayoutAbsoluteBlock(box);
 	}
@@ -1797,7 +1814,8 @@ static uiLayout *gpencil_draw_shaderfx(
 		/* only here obdata, the rest of effect is ob level */
 		UI_block_lock_set(block, BKE_object_obdata_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
 
-		/* result is the layout block inside the box, that we return so that effect settings can be drawn */
+		/* result is the layout block inside the box,
+		 * that we return so that effect settings can be drawn */
 		result = uiLayoutColumn(box, false);
 		block = uiLayoutAbsoluteBlock(box);
 	}
@@ -2022,7 +2040,8 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
 	if (proxy_protected) {
 		UI_block_emboss_set(block, UI_EMBOSS_NONE);
 
-		/* draw a ghost icon (for proxy) and also a lock beside it, to show that constraint is "proxy locked" */
+		/* draw a ghost icon (for proxy) and also a lock beside it,
+		 * to show that constraint is "proxy locked" */
 		uiDefIconBut(block, UI_BTYPE_BUT, B_CONSTRAINT_TEST, ICON_GHOST_ENABLED, xco + 12.2f * UI_UNIT_X, yco, 0.95f * UI_UNIT_X, 0.95f * UI_UNIT_Y,
 		             NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Proxy Protected"));
 		uiDefIconBut(block, UI_BTYPE_BUT, B_CONSTRAINT_TEST, ICON_LOCKED, xco + 13.1f * UI_UNIT_X, yco, 0.95f * UI_UNIT_X, 0.95f * UI_UNIT_Y,
@@ -3057,7 +3076,8 @@ static void curvemap_buttons_reset(bContext *C, void *cb_v, void *cumap_v)
 	rna_update_cb(C, cb_v, NULL);
 }
 
-/* still unsure how this call evolves... we use labeltype for defining what curve-channels to show */
+/* still unsure how this call evolves...
+ * we use labeltype for defining what curve-channels to show */
 static void curvemap_buttons_layout(
         uiLayout *layout, PointerRNA *ptr, char labeltype, bool levels,
         bool brush, bool neg_slope, bool tone, RNAUpdateCb *cb)
@@ -3756,7 +3776,8 @@ static void uilist_prepare(
 		rows = min_ii(dyn_data->height, maxrows);
 	}
 
-	/* If list length changes or list is tagged to check this, and active is out of view, scroll to it .*/
+	/* If list length changes or list is tagged to check this,
+	 * and active is out of view, scroll to it .*/
 	if (ui_list->list_last_len != len || ui_list->flag & UILST_SCROLL_TO_ACTIVE_ITEM) {
 		if (activei_row < ui_list->list_scroll) {
 			ui_list->list_scroll = activei_row;
@@ -4397,7 +4418,8 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs(
 
 	/* menu */
 	if (op->type->flag & OPTYPE_PRESET) {
-		/* XXX, no simple way to get WM_MT_operator_presets.bl_label from python! Label remains the same always! */
+		/* XXX, no simple way to get WM_MT_operator_presets.bl_label
+		 * from python! Label remains the same always! */
 		PointerRNA op_ptr;
 		uiLayout *row;
 
@@ -4868,7 +4890,8 @@ void uiTemplateKeymapItemProperties(uiLayout *layout, PointerRNA *ptr)
 			if (but->rnaprop) {
 				UI_but_func_set(but, keymap_item_modified, ptr->data, NULL);
 
-				/* Otherwise the keymap will be re-generated which we're trying to edit, see: T47685 */
+				/* Otherwise the keymap will be re-generated which we're trying to edit,
+				 * see: T47685 */
 				UI_but_flag_enable(but, UI_BUT_UPDATE_DELAY);
 			}
 		}
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index a7787d14776..5d262509e34 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -278,7 +278,8 @@ void ui_rna_collection_search_cb(const struct bContext *C, void *arg, const char
 			iconid = ui_id_icon_get(C, itemptr.data, false);
 		}
 		else {
-			name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */
+			/* could use the string length here */
+			name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL);
 		}
 
 		if (name) {
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index fcb995d089c..a531306f667 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -368,7 +368,8 @@ GPUBatch *ui_batch_roundbox_widget_get(int tria)
 		set_roundbox_vertex_data(&vflag_step, last_data);
 		set_roundbox_vertex(&vflag_step, 0, 0, 0, false, false, EMBOSS);
 		/* Emboss */
-		bool rev = false; /* go back and forth : avoid degenerate triangle (but beware of backface cull) */
+		/* go back and forth : avoid degenerate triangle (but beware of backface cull) */
+		bool rev = false;
 		for (int j = 0; j < WIDGET_AA_JITTER; j++, rev = !rev) {
 			for (int c = (rev) ? 1 : 0; (rev) ? c >= 0 : c < 2; (rev) ? c-- : c++) {
 				int sta = (rev) ? WIDGET_CURVE_RESOLU - 1 : 0;
@@ -685,7 +686,8 @@ static void round_box__edges(uiWidgetBase *wt, int roundboxalign, const rcti *re
 	float maxxi = maxx - U.pixelsize;
 	float minyi = miny + U.pixelsize;
 	float maxyi = maxy - U.pixelsize;
-	float facxi = (maxxi != minxi) ? 1.0f / (maxxi - minxi) : 0.0f; /* for uv, can divide by zero */
+	/* for uv, can divide by zero */
+	float facxi = (maxxi != minxi) ? 1.0f / (maxxi - minxi) : 0.0f;
 	float facyi = (maxyi != minyi) ? 1.0f / (maxyi - minyi) : 0.0f;
 	int a, tot = 0, minsize;
 	const int hnum = (
@@ -1448,7 +1450,8 @@ float UI_text_clip_middle_ex(
 	float strwidth;
 
 	/* Add some epsilon to OK width, avoids 'ellipsing' text that nearly fits!
-	 * Better to have a small piece of the last char cut out, than two remaining chars replaced by an ellipsis... */
+	 * Better to have a small piece of the last char cut out,
+	 * than two remaining chars replaced by an ellipsis... */
 	okwidth += 1.0f + UI_DPI_FAC;
 
 	BLI_assert(str[0]);
@@ -1463,7 +1466,8 @@ float UI_text_clip_middle_ex(
 	strwidth = BLF_width(fstyle->uifont_id, str, max_len);
 
 	if ((okwidth > 0.0f) && (strwidth > okwidth)) {
-		/* utf8 two-dots leader '..' (shorter than ellipsis '...'), some compilers complain with real litteral string. */
+		/* utf8 two-dots leader '..' (shorter than ellipsis '...'),
+		 * some compilers complain with real litteral string. */
 		const char sep[] = {0xe2, 0x80, 0xA5, 0x0};
 		const int sep_len = sizeof(sep) - 1;
 		const float sep_strwidth = BLF_width(fstyle->uifont_id, sep, sep_len + 1);
@@ -1527,7 +1531,8 @@ float UI_text_clip_middle_ex(
 			else {
 				memmove(str + l_end + sep_len, str + r_offset, r_len);
 				memcpy(str + l_end, sep, sep_len);
-				final_lpart_len = (size_t)(l_end + sep_len + r_len - 1);  /* -1 to remove trailing '\0'! */
+				/* -1 to remove trailing '\0'! */
+				final_lpart_len = (size_t)(l_end + sep_len + r_len - 1);
 
 				while (BLF_width(fstyle->uifont_id, str, max_len) > okwidth) {
 					/* This will happen because a lot of string width processing is done in integer pixels,
@@ -1690,7 +1695,8 @@ static void ui_text_clip_right_label(const uiFontStyle *fstyle, uiBut *but, cons
 			const char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2);
 			int bytes = cp2 - prev_utf8;
 
-			/* shift the text after and including cp2 back by 1 char, +1 to include null terminator */
+			/* shift the text after and including cp2 back by 1 char,
+			 * +1 to include null terminator */
 			memmove(cp2 - bytes, cp2, drawstr_len + 1);
 			cp2 -= bytes;
 
@@ -2323,7 +2329,8 @@ static void widget_state(uiWidgetType *wt, int state, int drawflag)
 static void widget_state_numslider(uiWidgetType *wt, int state, int drawflag)
 {
 	uiWidgetStateColors *wcol_state = wt->wcol_state;
-	float blend = wcol_state->blend - 0.2f; /* XXX special tweak to make sure that bar will still be visible */
+	/* XXX special tweak to make sure that bar will still be visible */
+	float blend = wcol_state->blend - 0.2f;
 
 	/* call this for option button */
 	widget_state(wt, state, drawflag);
@@ -2756,7 +2763,9 @@ void ui_draw_gradient(const rcti *rect, const float hsv[3], const int type, cons
 	immBindBuiltinProgram(GPU_SHADER_2D_SMOOTH_COLOR);
 
 	immBegin(GPU_PRIM_TRIS, steps * 3 * 6);
-	for (dx = 0.0f; dx < 0.999f; dx += color_step) { /* 0.999 = prevent float inaccuracy for steps */
+
+	/* 0.999 = prevent float inaccuracy for steps */
+	for (dx = 0.0f; dx < 0.999f; dx += color_step) {
 		const float dx_next = dx + color_step;
 
 		/* previous color */
@@ -3366,7 +3375,8 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s
 	wtb.draw_inner = false;
 	widgetbase_draw(&wtb, wcol);
 
-	/* Add space at either side of the button so text aligns with numbuttons (which have arrow icons). */
+	/* Add space at either side of the button so text aligns with numbuttons
+	 * (which have arrow icons). */
 	if (!(state & UI_STATE_TEXT_INPUT)) {
 		rect->xmax -= toffs;
 		rect->xmin += toffs;
@@ -3763,7 +3773,8 @@ static void widget_tab(uiWidgetColors *wcol, rcti *rect, int state, int roundbox
 	const float rad = wcol->roundness * U.widget_unit;
 	const bool is_active = (state & UI_SELECT);
 
-/* Draw shaded outline - Disabled for now, seems incorrect and also looks nicer without it imho ;) */
+/* Draw shaded outline - Disabled for now,
+ * seems incorrect and also looks nicer without it imho ;) */
 //#define USE_TAB_SHADED_HIGHLIGHT
 
 	uiWidgetBase wtb;
@@ -4252,7 +4263,8 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 				break;
 
 			case UI_BTYPE_HSVCUBE:
-				if (ELEM(but->a1, UI_GRAD_V_ALT, UI_GRAD_L_ALT)) {  /* vertical V slider, uses new widget draw now */
+				if (ELEM(but->a1, UI_GRAD_V_ALT, UI_GRAD_L_ALT)) {
+					/* vertical V slider, uses new widget draw now */
 					ui_draw_but_HSV_v(but, rect);
 				}
 				else {  /* other HSV pickers... */
@@ -4745,7 +4757,8 @@ void ui_draw_menu_item(const uiFontStyle *fstyle, rcti *rect, const char *name,
 		aspect = ICON_DEFAULT_HEIGHT / height;
 
 		GPU_blend(true);
-		UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f, wt->wcol.text); /* XXX scale weak get from fstyle? */
+		/* XXX scale weak get from fstyle? */
+		UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f, wt->wcol.text);
 		GPU_blend(false);
 	}
 }
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 3aadfeb5321..3f8f09d1f9f 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -236,7 +236,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
 				case TH_HEADER:
 					cp = ts->header; break;
 				case TH_HEADERDESEL:
-					/* we calculate a dynamic builtin header deselect color, also for pulldowns... */
+					/* we calculate a dynamic builtin header deselect color,
+					 * also for pulldowns... */
 					cp = ts->header;
 					headerdesel[0] = cp[0] > 10 ? cp[0] - 10 : 0;
 					headerdesel[1] = cp[1] > 10 ? cp[1] - 10 : 0;
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 6352dacad80..fb8e7e8d68f 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -234,7 +234,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 		 */
 		case V2D_COMMONVIEW_STANDARD:
 		{
-			/* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
+			/* for now, aspect ratio should be maintained,
+			 * and zoom is clamped within sane default limits */
 			v2d->keepzoom = (V2D_KEEPASPECT | V2D_LIMITZOOM);
 			v2d->minzoom = 0.01f;
 			v2d->maxzoom = 1000.0f;
@@ -289,7 +290,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 			/* scroller settings are currently not set here... that is left for regions... */
 			break;
 		}
-		/* 'header' regions - zoom, aspect ratio, alignment, and panning restrictions are set here */
+		/* 'header' regions - zoom, aspect ratio,
+		 * alignment, and panning restrictions are set here */
 		case V2D_COMMONVIEW_HEADER:
 		{
 			/* zoom + aspect ratio are locked */
@@ -322,7 +324,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 		case V2D_COMMONVIEW_PANELS_UI:
 		{
 
-			/* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
+			/* for now, aspect ratio should be maintained,
+			 * and zoom is clamped within sane default limits */
 			v2d->keepzoom = (V2D_KEEPASPECT | V2D_LIMITZOOM | V2D_KEEPZOOM);
 			v2d->minzoom = 0.5f;
 			v2d->maxzoom = 2.0f;
@@ -357,7 +360,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 		}
 		/* other view types are completely defined using their own settings already */
 		default:
-			/* we don't do anything here, as settings should be fine, but just make sure that rect */
+			/* we don't do anything here,
+			 * as settings should be fine, but just make sure that rect */
 			break;
 	}
 
@@ -377,7 +381,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 	}
 
 	/* set 'tot' rect before setting cur? */
-	/* XXX confusing stuff here still - I made this function not check scroller hide - that happens in totrect_set */
+	/* XXX confusing stuff here still -
+	 * I made this function not check scroller hide - that happens in totrect_set */
 	if (tot_changed)
 		UI_view2d_totRect_set_resize(v2d, winx, winy, !do_init);
 	else
@@ -486,7 +491,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas
 		}
 	}
 	else {
-		/* make sure sizes don't exceed that of the min/max sizes (even though we're not doing zoom clamping) */
+		/* make sure sizes don't exceed that of the min/max sizes
+		 * (even though we're not doing zoom clamping) */
 		CLAMP(width, v2d->min[0], v2d->max[0]);
 		CLAMP(height, v2d->min[1], v2d->max[1]);
 	}
@@ -576,7 +582,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas
 		v2d->oldwiny = (short)winy;
 	}
 
-	/* Step 2: apply new sizes to cur rect, but need to take into account alignment settings here... */
+	/* Step 2: apply new sizes to cur rect,
+	 * but need to take into account alignment settings here... */
 	if ((width != curwidth) || (height != curheight)) {
 		float temp, dh;
 
@@ -675,7 +682,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas
 			 * (XXX - in the past, max was favored... if there are bugs, swap!)
 			 */
 			if ((cur->xmin < tot->xmin) && (cur->xmax > tot->xmax)) {
-				/* outside boundaries on both sides, so take middle-point of tot, and place in balanced way */
+				/* outside boundaries on both sides,
+				 * so take middle-point of tot, and place in balanced way */
 				temp = BLI_rctf_cent_x(tot);
 				diff = curwidth * 0.5f;
 
@@ -725,7 +733,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas
 			 * We favour moving the 'minimum' across, as that's origin for most things
 			 */
 			if ((cur->ymin < tot->ymin) && (cur->ymax > tot->ymax)) {
-				/* outside boundaries on both sides, so take middle-point of tot, and place in balanced way */
+				/* outside boundaries on both sides,
+				 * so take middle-point of tot, and place in balanced way */
 				temp = BLI_rctf_cent_y(tot);
 				diff = curheight * 0.5f;
 
@@ -803,7 +812,8 @@ void UI_view2d_curRect_validate(View2D *v2d)
 
 /* ------------------ */
 
-/* Called by menus to activate it, or by view2d operators to make sure 'related' views stay in synchrony */
+/* Called by menus to activate it, or by view2d operators
+ * to make sure 'related' views stay in synchrony */
 void UI_view2d_sync(bScreen *screen, ScrArea *area, View2D *v2dcur, int flag)
 {
 	ScrArea *sa;
@@ -992,7 +1002,8 @@ void UI_view2d_totRect_set(View2D *v2d, int width, int height)
 
 	UI_view2d_totRect_set_resize(v2d, width, height, 0);
 
-	/* solve bad recursion... if scroller state changed, mask is different, so you get different rects */
+	/* solve bad recursion... if scroller state changed,
+	 * mask is different, so you get different rects */
 	if (scroll != view2d_scroll_mapped(v2d->scroll)) {
 		UI_view2d_totRect_set_resize(v2d, width, height, 0);
 	}
@@ -1072,7 +1083,8 @@ static void view2d_map_cur_using_mask(View2D *v2d, rctf *curmasked)
 		float sizex = BLI_rcti_size_x(&v2d->mask);
 		float sizey = BLI_rcti_size_y(&v2d->mask);
 
-		/* prevent tiny or narrow regions to get invalid coordinates - mask can get negative even... */
+		/* prevent tiny or narrow regions to get
+		 * invalid coordinates - mask can get negative even... */
 		if (sizex > 0.0f && sizey > 0.0f) {
 			float dx = BLI_rctf_size_x(&v2d->cur) / (sizex + 1);
 			float dy = BLI_rctf_size_y(&v2d->cur) / (sizey + 1);
@@ -1109,7 +1121,8 @@ void UI_view2d_view_ortho(View2D *v2d)
 	if (sizey > 0)
 		yofs = eps * BLI_rctf_size_y(&v2d->cur) / sizey;
 
-	/* apply mask-based adjustments to cur rect (due to scrollers), to eliminate scaling artifacts */
+	/* apply mask-based adjustments to cur rect (due to scrollers),
+	 * to eliminate scaling artifacts */
 	view2d_map_cur_using_mask(v2d, &curmasked);
 
 	BLI_rctf_translate(&curmasked, -xofs, -yofs);
@@ -1145,7 +1158,8 @@ void UI_view2d_view_orthoSpecial(ARegion *ar, View2D *v2d, const bool xaxis)
 	xofs = 0.0f; // (v2d->flag & V2D_PIXELOFS_X) ? GLA_PIXEL_OFS : 0.0f;
 	yofs = 0.0f; // (v2d->flag & V2D_PIXELOFS_Y) ? GLA_PIXEL_OFS : 0.0f;
 
-	/* apply mask-based adjustments to cur rect (due to scrollers), to eliminate scaling artifacts */
+	/* apply mask-based adjustments to cur rect (due to scrollers),
+	 * to eliminate scaling artifacts */
 	view2d_map_cur_using_mask(v2d, &curmasked);
 
 	/* only set matrix with 'cur' coordinates on relevant axes */
@@ -1202,7 +1216,9 @@ static void step_to_grid(float *step, int *power, int unit)
 		/* for frames, we want 1.0 frame intervals only */
 		if (unit == V2D_UNIT_FRAMES) {
 			rem = 1.0f;
-			*step = 2.0f; /* use 2 since there are grid lines drawn in between, this way to get 1 line per frame */
+			/* use 2 since there are grid lines drawn in between,
+			 * this way to get 1 line per frame */
+			*step = 2.0f;
 		}
 
 		/* prevents printing 1.0 2.0 3.0 etc */
@@ -1806,7 +1822,8 @@ static void scroll_printstr(Scene *scene, float x, float y, float val, int power
 		BLI_timecode_string_from_time_seconds(timecode_str, sizeof(timecode_str), power, val);
 	}
 
-	/* get length of string, and adjust printing location to fit it into the horizontal scrollbar */
+	/* get length of string,
+	 * and adjust printing location to fit it into the horizontal scrollbar */
 	len = strlen(timecode_str);
 	if (dir == 'h') {
 		/* seconds/timecode display has slightly longer strings... */
@@ -1935,7 +1952,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 							break;
 
 						case V2D_UNIT_DEGREES:      /* Graph Editor for rotation Drivers */
-							/* HACK: although we're drawing horizontal, we make this draw as 'vertical', just to get degree signs */
+							/* HACK: although we're drawing horizontal,
+							 * we make this draw as 'vertical', just to get degree signs */
 							scroll_printstr(scene, fac, h, val, grid->powerx, V2D_UNIT_DEGREES, 'v');
 							break;
 					}
@@ -2004,7 +2022,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 			UI_FontThemeColor(font_id, TH_TEXT);
 			val = grid->starty;
 
-			/* if vertical clamping (to whole numbers) is used (i.e. in Sequencer), apply correction */
+			/* if vertical clamping (to whole numbers) is used (i.e. in Sequencer),
+			 * apply correction */
 			if (vs->yclamp == V2D_GRID_CLAMP)
 				fac += 0.5f * dfac;
 
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index 62bc7e87f0e..4a19e57ba1d 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -77,19 +77,28 @@ static bool view2d_poll(bContext *C)
 
 /* temp customdata for operator */
 typedef struct v2dViewPanData {
-	bScreen *sc;            /* screen where view pan was initiated */
-	ScrArea *sa;            /* area where view pan was initiated */
-	ARegion *ar;            /* region where view pan was initiated */
-	View2D *v2d;            /* view2d we're operating in */
+	/** screen where view pan was initiated */
+	bScreen *sc;
+	/** area where view pan was initiated */
+	ScrArea *sa;
+	/** region where view pan was initiated */
+	ARegion *ar;
+	/** view2d we're operating in */
+	View2D *v2d;
 
-	float facx, facy;       /* amount to move view relative to zoom */
+	/** amount to move view relative to zoom */
+	float facx, facy;
 
 	/* options for version 1 */
-	int startx, starty;     /* mouse x/y values in window when operator was initiated */
-	int lastx, lasty;       /* previous x/y values of mouse in window */
-	int invoke_event;       /* event starting pan, for modal exit */
-
-	short in_scroller;      /* for MMB in scrollers (old feature in past, but now not that useful) */
+	/** mouse x/y values in window when operator was initiated */
+	int startx, starty;
+	/** previous x/y values of mouse in window */
+	int lastx, lasty;
+	/** event starting pan, for modal exit */
+	int invoke_event;
+
+	/** for MMB in scrollers (old feature in past, but now not that useful) */
+	short in_scroller;
 } v2dViewPanData;
 
 /* initialize panning customdata */
@@ -256,7 +265,8 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-/* handle user input - calculations of mouse-movement need to be done here, not in the apply callback! */
+/* handle user input - calculations of mouse-movement
+ * need to be done here, not in the apply callback! */
 static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	v2dViewPanData *vpd = op->customdata;
@@ -669,7 +679,8 @@ static void view_zoomstep_apply_ex(
 			v2d->cur.xmax -= dx;
 
 			if (use_mousepos && (U.uiflag & USER_ZOOM_TO_MOUSEPOS)) {
-				/* get zoom fac the same way as in ui_view2d_curRect_validate_resize - better keep in sync! */
+				/* get zoom fac the same way as in
+				 * ui_view2d_curRect_validate_resize - better keep in sync! */
 				const float zoomx = (float)(BLI_rcti_size_x(&v2d->mask) + 1) / BLI_rctf_size_x(&v2d->cur);
 
 				/* only move view to mouse if zoom fac is inside minzoom/maxzoom */
@@ -702,7 +713,8 @@ static void view_zoomstep_apply_ex(
 			v2d->cur.ymax -= dy;
 
 			if (use_mousepos && (U.uiflag & USER_ZOOM_TO_MOUSEPOS)) {
-				/* get zoom fac the same way as in ui_view2d_curRect_validate_resize - better keep in sync! */
+				/* get zoom fac the same way as in
+				 * ui_view2d_curRect_validate_resize - better keep in sync! */
 				const float zoomy = (float)(BLI_rcti_size_y(&v2d->mask) + 1) / BLI_rctf_size_y(&v2d->cur);
 
 				/* only move view to mouse if zoom fac is inside minzoom/maxzoom */
@@ -1042,7 +1054,8 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, const wmEvent *even
 			fac = 0.01f * (event->prevy - event->y);
 		dy = fac * BLI_rctf_size_y(&v2d->cur) / 10.0f;
 
-		/* support trackpad zoom to always zoom entirely - the v2d code uses portrait or landscape exceptions */
+		/* support trackpad zoom to always zoom entirely - the v2d code uses portrait or
+		 * landscape exceptions */
 		if (v2d->keepzoom & V2D_KEEPASPECT) {
 			if (fabsf(dx) > fabsf(dy))
 				dy = dx;
@@ -1095,7 +1108,8 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	return OPERATOR_RUNNING_MODAL;
 }
 
-/* handle user input - calculations of mouse-movement need to be done here, not in the apply callback! */
+/* handle user input - calculations of mouse-movement need to be done here,
+ * not in the apply callback! */
 static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	v2dViewZoomData *vzd = op->customdata;
@@ -1141,7 +1155,8 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event
 
 		}
 
-		/* support zoom to always zoom entirely - the v2d code uses portrait or landscape exceptions */
+		/* support zoom to always zoom entirely - the v2d code uses portrait or
+		 * landscape exceptions */
 		if (v2d->keepzoom & V2D_KEEPASPECT) {
 			if (fabsf(dx) > fabsf(dy))
 				dy = dx;
@@ -1270,7 +1285,8 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op)
 		 */
 		float zoom, center, size;
 
-		/* TODO: is this zoom factor calculation valid? It seems to produce same results every time... */
+		/* TODO: is this zoom factor calculation valid?
+		 * It seems to produce same results every time... */
 		if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) {
 			size = BLI_rctf_size_x(&cur_new);
 			zoom = size / BLI_rctf_size_x(&rect);
@@ -1487,7 +1503,8 @@ void UI_view2d_smooth_view(
 			if (v2d->smooth_timer)
 				WM_event_remove_timer(wm, win, v2d->smooth_timer);
 			/* TIMER1 is hardcoded in keymap */
-			v2d->smooth_timer = WM_event_add_timer(wm, win, TIMER1, 1.0 / 100.0); /* max 30 frs/sec */
+			/* max 30 frs/sec */
+			v2d->smooth_timer = WM_event_add_timer(wm, win, TIMER1, 1.0 / 100.0);
 
 			ok = true;
 		}
@@ -1583,20 +1600,32 @@ static void VIEW2D_OT_smoothview(wmOperatorType *ot)
 
 /* customdata for scroller-invoke data */
 typedef struct v2dScrollerMove {
-	View2D *v2d;            /* View2D data that this operation affects */
-	ARegion *ar;            /* region that the scroller is in */
+	/** View2D data that this operation affects */
+	View2D *v2d;
+	/** region that the scroller is in */
+	ARegion *ar;
+
+	/** scroller that mouse is in ('h' or 'v') */
+	char scroller;
 
-	char scroller;          /* scroller that mouse is in ('h' or 'v') */
-	short zone; /* -1 is min zoomer, 0 is bar, 1 is max zoomer */             // XXX find some way to provide visual feedback of this (active color?)
+	/* XXX find some way to provide visual feedback of this (active color?) */
+	/** -1 is min zoomer, 0 is bar, 1 is max zoomer */
+	short zone;
 
-	float fac;              /* view adjustment factor, based on size of region */
-	float fac_round;        /* for pixel rounding (avoid visible UI jitter) */
-	float delta;            /* amount moved by mouse on axis of interest */
+	/** view adjustment factor, based on size of region */
+	float fac;
+	/** for pixel rounding (avoid visible UI jitter) */
+	float fac_round;
+	/** amount moved by mouse on axis of interest */
+	float delta;
 
-	float scrollbarwidth;   /* width of the scrollbar itself, used for page up/down clicks */
-	int scrollbar_orig;      /* initial location of scrollbar x/y, mouse relative */
+	/** width of the scrollbar itself, used for page up/down clicks */
+	float scrollbarwidth;
+	/** initial location of scrollbar x/y, mouse relative */
+	int scrollbar_orig;
 
-	int lastx, lasty;       /* previous mouse coordinates (in screen coordinates) for determining movement */
+	/** previous mouse coordinates (in screen coordinates) for determining movement */
+	int lastx, lasty;
 } v2dScrollerMove;
 
 
@@ -1719,8 +1748,8 @@ static void scroller_activate_init(bContext *C, wmOperator *op, const wmEvent *e
 	 */
 	scrollers = UI_view2d_scrollers_calc(C, v2d, NULL, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
 
-	/* use a union of 'cur' & 'tot' incase the current view is far outside 'tot'.
-	 * In this cases moving the scroll bars has far too little effect and the view can get stuck [#31476] */
+	/* use a union of 'cur' & 'tot' incase the current view is far outside 'tot'. In this cases
+	 * moving the scroll bars has far too little effect and the view can get stuck T31476. */
 	tot_cur_union = v2d->tot;
 	BLI_rctf_union(&tot_cur_union, &v2d->cur);
 
@@ -1866,10 +1895,12 @@ static int scroller_activate_modal(bContext *C, wmOperator *op, const wmEvent *e
 			if (ELEM(vsm->zone, SCROLLHANDLE_BAR, SCROLLHANDLE_MAX)) {
 				/* if using bar (i.e. 'panning') or 'max' zoom widget */
 				switch (vsm->scroller) {
-					case 'h': /* horizontal scroller - so only horizontal movement ('cur' moves opposite to mouse) */
+					case 'h': /* horizontal scroller - so only horizontal movement
+					           * ('cur' moves opposite to mouse) */
 						vsm->delta = (float)(event->x - vsm->lastx);
 						break;
-					case 'v': /* vertical scroller - so only vertical movement ('cur' moves opposite to mouse) */
+					case 'v': /* vertical scroller - so only vertical movement
+					           * ('cur' moves opposite to mouse) */
 						vsm->delta = (float)(event->y - vsm->lasty);
 						break;
 				}
@@ -1877,10 +1908,12 @@ static int scroller_activate_modal(bContext *C, wmOperator *op, const wmEvent *e
 			else if (vsm->zone == SCROLLHANDLE_MIN) {
 				/* using 'min' zoom widget */
 				switch (vsm->scroller) {
-					case 'h': /* horizontal scroller - so only horizontal movement ('cur' moves with mouse) */
+					case 'h': /* horizontal scroller - so only horizontal movement
+					           * ('cur' moves with mouse) */
 						vsm->delta = (float)(vsm->lastx - event->x);
 						break;
-					case 'v': /* vertical scroller - so only vertical movement ('cur' moves with to mouse) */
+					case 'v': /* vertical scroller - so only vertical movement
+					           * ('cur' moves with to mouse) */
 						vsm->delta = (float)(vsm->lasty - event->y);
 						break;
 				}
@@ -1922,7 +1955,8 @@ static int scroller_activate_modal(bContext *C, wmOperator *op, const wmEvent *e
 }
 
 
-/* a click (or click drag in progress) should have occurred, so check if it happened in scrollbar */
+/* a click (or click drag in progress)
+ * should have occurred, so check if it happened in scrollbar */
 static int scroller_activate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	ARegion *ar = CTX_wm_region(C);
@@ -1931,7 +1965,8 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, const wmEvent *
 	/* check if mouse in scrollbars, if they're enabled */
 	const char in_scroller = UI_view2d_mouse_in_scrollers(ar, v2d, event->x, event->y);
 
-	/* if in a scroller, init customdata then set modal handler which will catch mousedown to start doing useful stuff */
+	/* if in a scroller, init customdata then set modal handler which will
+	 * catch mousedown to start doing useful stuff */
 	if (in_scroller) {
 		v2dScrollerMove *vsm;
 
@@ -1942,10 +1977,12 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, const wmEvent *
 		/* support for quick jump to location - gtk and qt do this on linux */
 		if (event->type == MIDDLEMOUSE) {
 			switch (vsm->scroller) {
-				case 'h': /* horizontal scroller - so only horizontal movement ('cur' moves opposite to mouse) */
+				case 'h': /* horizontal scroller - so only horizontal movement
+				           * ('cur' moves opposite to mouse) */
 					vsm->delta = (float)(event->x - vsm->scrollbar_orig);
 					break;
-				case 'v': /* vertical scroller - so only vertical movement ('cur' moves opposite to mouse) */
+				case 'v': /* vertical scroller - so only vertical movement
+				           * ('cur' moves opposite to mouse) */
 					vsm->delta = (float)(event->y - vsm->scrollbar_orig);
 					break;
 			}
@@ -2002,7 +2039,8 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, const wmEvent *
 		return OPERATOR_RUNNING_MODAL;
 	}
 	else {
-		/* not in scroller, so nothing happened... (pass through let's something else catch event) */
+		/* not in scroller, so nothing happened...
+		 * (pass through let's something else catch event) */
 		return OPERATOR_PASS_THROUGH;
 	}
 }