ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 382 insertions, 379 deletions

diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
index 3d2e7c89f2b..47a584561f9 100644
--- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
@@ -49,8 +49,8 @@
  * \{ */
 
 enum {
-	EXTRUDE_AXIS_NORMAL = 0,
-	EXTRUDE_AXIS_XYZ = 1,
+  EXTRUDE_AXIS_NORMAL = 0,
+  EXTRUDE_AXIS_XYZ = 1,
 };
 
 static const float extrude_button_scale = 0.15f;
@@ -61,415 +61,418 @@ static const float extrude_arrow_normal_axis_scale = 1.0f;
 static const float extrude_dial_scale = 0.2;
 
 static const uchar shape_plus[] = {
-	0x5f, 0xfb, 0x40, 0xee, 0x25, 0xda, 0x11, 0xbf, 0x4, 0xa0, 0x0, 0x80, 0x4, 0x5f, 0x11,
-	0x40, 0x25, 0x25, 0x40, 0x11, 0x5f, 0x4, 0x7f, 0x0, 0xa0, 0x4, 0xbf, 0x11, 0xda, 0x25,
-	0xee, 0x40, 0xfb, 0x5f, 0xff, 0x7f, 0xfb, 0xa0, 0xee, 0xbf, 0xda, 0xda, 0xbf, 0xee,
-	0xa0, 0xfb, 0x80, 0xff, 0x6e, 0xd7, 0x92, 0xd7, 0x92, 0x90, 0xd8, 0x90, 0xd8, 0x6d,
-	0x92, 0x6d, 0x92, 0x27, 0x6e, 0x27, 0x6e, 0x6d, 0x28, 0x6d, 0x28, 0x90, 0x6e,
-	0x90, 0x6e, 0xd7, 0x80, 0xff, 0x5f, 0xfb, 0x5f, 0xfb,
+    0x5f, 0xfb, 0x40, 0xee, 0x25, 0xda, 0x11, 0xbf, 0x4,  0xa0, 0x0,  0x80, 0x4,  0x5f, 0x11, 0x40,
+    0x25, 0x25, 0x40, 0x11, 0x5f, 0x4,  0x7f, 0x0,  0xa0, 0x4,  0xbf, 0x11, 0xda, 0x25, 0xee, 0x40,
+    0xfb, 0x5f, 0xff, 0x7f, 0xfb, 0xa0, 0xee, 0xbf, 0xda, 0xda, 0xbf, 0xee, 0xa0, 0xfb, 0x80, 0xff,
+    0x6e, 0xd7, 0x92, 0xd7, 0x92, 0x90, 0xd8, 0x90, 0xd8, 0x6d, 0x92, 0x6d, 0x92, 0x27, 0x6e, 0x27,
+    0x6e, 0x6d, 0x28, 0x6d, 0x28, 0x90, 0x6e, 0x90, 0x6e, 0xd7, 0x80, 0xff, 0x5f, 0xfb, 0x5f, 0xfb,
 };
 
 typedef struct GizmoExtrudeGroup {
 
-	/* XYZ & normal. */
-	wmGizmo *invoke_xyz_no[4];
-	/* Constrained & unconstrained (arrow & circle). */
-	wmGizmo *adjust[2];
-	int             adjust_axis;
-
-	/* Copied from the transform operator,
-	 * use to redo with the same settings. */
-	struct {
-		float orient_matrix[3][3];
-		bool  constraint_axis[3];
-		float value[4];
-	} redo_xform;
-
-	/* Depends on object type. */
-	int normal_axis;
-
-	struct {
-		float normal_mat3[3][3];  /* use Z axis for normal. */
-		int orientation_type;
-	} data;
-
-	wmOperatorType *ot_extrude;
-	PropertyRNA *gzgt_axis_type_prop;
+  /* XYZ & normal. */
+  wmGizmo *invoke_xyz_no[4];
+  /* Constrained & unconstrained (arrow & circle). */
+  wmGizmo *adjust[2];
+  int adjust_axis;
+
+  /* Copied from the transform operator,
+   * use to redo with the same settings. */
+  struct {
+    float orient_matrix[3][3];
+    bool constraint_axis[3];
+    float value[4];
+  } redo_xform;
+
+  /* Depends on object type. */
+  int normal_axis;
+
+  struct {
+    float normal_mat3[3][3]; /* use Z axis for normal. */
+    int orientation_type;
+  } data;
+
+  wmOperatorType *ot_extrude;
+  PropertyRNA *gzgt_axis_type_prop;
 } GizmoExtrudeGroup;
 
-static void gizmo_mesh_extrude_orientation_matrix_set(
-        struct GizmoExtrudeGroup *ggd, const float mat[3][3])
+static void gizmo_mesh_extrude_orientation_matrix_set(struct GizmoExtrudeGroup *ggd,
+                                                      const float mat[3][3])
 {
-	for (int i = 0; i < 3; i++) {
-		mul_v3_v3fl(
-		        ggd->invoke_xyz_no[i]->matrix_offset[3],
-		        mat[i],
-		        (extrude_arrow_xyz_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
-	}
+  for (int i = 0; i < 3; i++) {
+    mul_v3_v3fl(ggd->invoke_xyz_no[i]->matrix_offset[3],
+                mat[i],
+                (extrude_arrow_xyz_axis_scale * extrude_button_offset_scale) /
+                    extrude_button_scale);
+  }
 }
 
-static void gizmo_mesh_extrude_orientation_matrix_set_for_adjust(
-        struct GizmoExtrudeGroup *ggd, const float mat[3][3])
+static void gizmo_mesh_extrude_orientation_matrix_set_for_adjust(struct GizmoExtrudeGroup *ggd,
+                                                                 const float mat[3][3])
 {
-	/* Set orientation without location. */
-	for (int j = 0; j < 3; j++) {
-		copy_v3_v3(ggd->adjust[0]->matrix_basis[j], mat[j]);
-	}
-	/* nop when (i == 2). */
-	swap_v3_v3(ggd->adjust[0]->matrix_basis[ggd->adjust_axis], ggd->adjust[0]->matrix_basis[2]);
+  /* Set orientation without location. */
+  for (int j = 0; j < 3; j++) {
+    copy_v3_v3(ggd->adjust[0]->matrix_basis[j], mat[j]);
+  }
+  /* nop when (i == 2). */
+  swap_v3_v3(ggd->adjust[0]->matrix_basis[ggd->adjust_axis], ggd->adjust[0]->matrix_basis[2]);
 }
 
 static void gizmo_mesh_extrude_setup(const bContext *C, wmGizmoGroup *gzgroup)
 {
-	struct GizmoExtrudeGroup *ggd = MEM_callocN(sizeof(GizmoExtrudeGroup), __func__);
-	gzgroup->customdata = ggd;
-
-	const wmGizmoType *gzt_arrow = WM_gizmotype_find("GIZMO_GT_arrow_3d", true);
-	const wmGizmoType *gzt_move = WM_gizmotype_find("GIZMO_GT_button_2d", true);
-	const wmGizmoType *gzt_dial = WM_gizmotype_find("GIZMO_GT_dial_3d", true);
-
-	ggd->adjust[0] = WM_gizmo_new_ptr(gzt_arrow, gzgroup, NULL);
-	ggd->adjust[1] = WM_gizmo_new_ptr(gzt_dial, gzgroup, NULL);
-	for (int i = 0; i < 4; i++) {
-		ggd->invoke_xyz_no[i] = WM_gizmo_new_ptr(gzt_move, gzgroup, NULL);
-		ggd->invoke_xyz_no[i]->flag |= WM_GIZMO_DRAW_OFFSET_SCALE;
-	}
-
-	{
-		PropertyRNA *prop = RNA_struct_find_property(ggd->invoke_xyz_no[3]->ptr, "shape");
-		for (int i = 0; i < 4; i++) {
-			RNA_property_string_set_bytes(
-			        ggd->invoke_xyz_no[i]->ptr, prop,
-			        (const char *)shape_plus, ARRAY_SIZE(shape_plus));
-		}
-	}
-
-	{
-		const char *op_idname = NULL;
-		/* grease pencil does not use obedit */
-		/* GPXX: Remove if OB_MODE_EDIT_GPENCIL is merged with OB_MODE_EDIT */
-		const Object *obact = CTX_data_active_object(C);
-		if (obact->type == OB_GPENCIL) {
-			op_idname = "GPENCIL_OT_extrude_move";
-		}
-		else if (obact->type == OB_MESH) {
-			op_idname = "MESH_OT_extrude_context_move";
-			ggd->normal_axis = 2;
-		}
-		else if (obact->type == OB_ARMATURE) {
-			op_idname = "ARMATURE_OT_extrude_move";
-			ggd->normal_axis = 1;
-		}
-		else if (obact->type == OB_CURVE) {
-			op_idname = "CURVE_OT_extrude_move";
-			ggd->normal_axis = 2;
-		}
-		else {
-			BLI_assert(0);
-		}
-		ggd->ot_extrude = WM_operatortype_find(op_idname, true);
-		ggd->gzgt_axis_type_prop = RNA_struct_type_find_property(gzgroup->type->srna, "axis_type");
-	}
-
-	for (int i = 0; i < 3; i++) {
-		UI_GetThemeColor3fv(TH_AXIS_X + i, ggd->invoke_xyz_no[i]->color);
-	}
-	UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, ggd->invoke_xyz_no[3]->color);
-	for (int i = 0; i < 2; i++) {
-		UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, ggd->adjust[i]->color);
-	}
-
-	for (int i = 0; i < 4; i++) {
-		WM_gizmo_set_scale(ggd->invoke_xyz_no[i], extrude_button_scale);
-	}
-	WM_gizmo_set_scale(ggd->adjust[0], extrude_arrow_scale);
-	WM_gizmo_set_scale(ggd->adjust[1], extrude_dial_scale);
-	ggd->adjust[1]->line_width = 2.0f;
-
-	/* XYZ & normal axis extrude. */
-	for (int i = 0; i < 4; i++) {
-		PointerRNA *ptr = WM_gizmo_operator_set(ggd->invoke_xyz_no[i], 0, ggd->ot_extrude, NULL);
-		{
-			bool constraint[3] = {0, 0, 0};
-			constraint[(i < 3) ? i : ggd->normal_axis] = true;
-			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
-			RNA_boolean_set(&macroptr, "release_confirm", true);
-			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
-		}
-	}
-
-	/* Adjust extrude. */
-	for (int i = 0; i < 2; i++) {
-		wmGizmo *gz = ggd->adjust[i];
-		PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ggd->ot_extrude, NULL);
-		PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
-		RNA_boolean_set(&macroptr, "release_confirm", true);
-		wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
-		gzop->is_redo = true;
-	}
+  struct GizmoExtrudeGroup *ggd = MEM_callocN(sizeof(GizmoExtrudeGroup), __func__);
+  gzgroup->customdata = ggd;
+
+  const wmGizmoType *gzt_arrow = WM_gizmotype_find("GIZMO_GT_arrow_3d", true);
+  const wmGizmoType *gzt_move = WM_gizmotype_find("GIZMO_GT_button_2d", true);
+  const wmGizmoType *gzt_dial = WM_gizmotype_find("GIZMO_GT_dial_3d", true);
+
+  ggd->adjust[0] = WM_gizmo_new_ptr(gzt_arrow, gzgroup, NULL);
+  ggd->adjust[1] = WM_gizmo_new_ptr(gzt_dial, gzgroup, NULL);
+  for (int i = 0; i < 4; i++) {
+    ggd->invoke_xyz_no[i] = WM_gizmo_new_ptr(gzt_move, gzgroup, NULL);
+    ggd->invoke_xyz_no[i]->flag |= WM_GIZMO_DRAW_OFFSET_SCALE;
+  }
+
+  {
+    PropertyRNA *prop = RNA_struct_find_property(ggd->invoke_xyz_no[3]->ptr, "shape");
+    for (int i = 0; i < 4; i++) {
+      RNA_property_string_set_bytes(
+          ggd->invoke_xyz_no[i]->ptr, prop, (const char *)shape_plus, ARRAY_SIZE(shape_plus));
+    }
+  }
+
+  {
+    const char *op_idname = NULL;
+    /* grease pencil does not use obedit */
+    /* GPXX: Remove if OB_MODE_EDIT_GPENCIL is merged with OB_MODE_EDIT */
+    const Object *obact = CTX_data_active_object(C);
+    if (obact->type == OB_GPENCIL) {
+      op_idname = "GPENCIL_OT_extrude_move";
+    }
+    else if (obact->type == OB_MESH) {
+      op_idname = "MESH_OT_extrude_context_move";
+      ggd->normal_axis = 2;
+    }
+    else if (obact->type == OB_ARMATURE) {
+      op_idname = "ARMATURE_OT_extrude_move";
+      ggd->normal_axis = 1;
+    }
+    else if (obact->type == OB_CURVE) {
+      op_idname = "CURVE_OT_extrude_move";
+      ggd->normal_axis = 2;
+    }
+    else {
+      BLI_assert(0);
+    }
+    ggd->ot_extrude = WM_operatortype_find(op_idname, true);
+    ggd->gzgt_axis_type_prop = RNA_struct_type_find_property(gzgroup->type->srna, "axis_type");
+  }
+
+  for (int i = 0; i < 3; i++) {
+    UI_GetThemeColor3fv(TH_AXIS_X + i, ggd->invoke_xyz_no[i]->color);
+  }
+  UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, ggd->invoke_xyz_no[3]->color);
+  for (int i = 0; i < 2; i++) {
+    UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, ggd->adjust[i]->color);
+  }
+
+  for (int i = 0; i < 4; i++) {
+    WM_gizmo_set_scale(ggd->invoke_xyz_no[i], extrude_button_scale);
+  }
+  WM_gizmo_set_scale(ggd->adjust[0], extrude_arrow_scale);
+  WM_gizmo_set_scale(ggd->adjust[1], extrude_dial_scale);
+  ggd->adjust[1]->line_width = 2.0f;
+
+  /* XYZ & normal axis extrude. */
+  for (int i = 0; i < 4; i++) {
+    PointerRNA *ptr = WM_gizmo_operator_set(ggd->invoke_xyz_no[i], 0, ggd->ot_extrude, NULL);
+    {
+      bool constraint[3] = {0, 0, 0};
+      constraint[(i < 3) ? i : ggd->normal_axis] = true;
+      PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
+      RNA_boolean_set(&macroptr, "release_confirm", true);
+      RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
+    }
+  }
+
+  /* Adjust extrude. */
+  for (int i = 0; i < 2; i++) {
+    wmGizmo *gz = ggd->adjust[i];
+    PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ggd->ot_extrude, NULL);
+    PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
+    RNA_boolean_set(&macroptr, "release_confirm", true);
+    wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
+    gzop->is_redo = true;
+  }
 }
 
 static void gizmo_mesh_extrude_refresh(const bContext *C, wmGizmoGroup *gzgroup)
 {
-	GizmoExtrudeGroup *ggd = gzgroup->customdata;
-
-	for (int i = 0; i < 4; i++) {
-		WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, true);
-	}
-	for (int i = 0; i < 2; i++) {
-		WM_gizmo_set_flag(ggd->adjust[i], WM_GIZMO_HIDDEN, true);
-	}
-
-	if (G.moving) {
-		return;
-	}
-
-	Scene *scene = CTX_data_scene(C);
-
-	int axis_type;
-	{
-		PointerRNA ptr;
-		bToolRef *tref = WM_toolsystem_ref_from_context((bContext *)C);
-		WM_toolsystem_ref_properties_ensure_from_gizmo_group(tref, gzgroup->type, &ptr);
-		axis_type = RNA_property_enum_get(&ptr, ggd->gzgt_axis_type_prop);
-	}
-
-	ggd->data.orientation_type = scene->orientation_slots[SCE_ORIENT_DEFAULT].type;
-	const bool use_normal = (
-	        (ggd->data.orientation_type != V3D_ORIENT_NORMAL) ||
-	        (axis_type == EXTRUDE_AXIS_NORMAL));
-	const int axis_len_used = use_normal ? 4 : 3;
-
-	struct TransformBounds tbounds;
-
-	if (use_normal) {
-		struct TransformBounds tbounds_normal;
-		if (!ED_transform_calc_gizmo_stats(
-		            C, &(struct TransformCalcParams){
-		                .orientation_type = V3D_ORIENT_NORMAL + 1,
-		            }, &tbounds_normal))
-		{
-			unit_m3(tbounds_normal.axis);
-		}
-		copy_m3_m3(ggd->data.normal_mat3, tbounds_normal.axis);
-	}
-
-	/* TODO(campbell): run second since this modifies the 3D view, it should not. */
-	if (!ED_transform_calc_gizmo_stats(
-	            C, &(struct TransformCalcParams){
-	                .orientation_type = ggd->data.orientation_type + 1,
-	            }, &tbounds))
-	{
-		return;
-	}
-
-	/* Main axis is normal. */
-	if (!use_normal) {
-		copy_m3_m3(ggd->data.normal_mat3, tbounds.axis);
-	}
-
-	/* Offset the add icon. */
-	mul_v3_v3fl(
-	        ggd->invoke_xyz_no[3]->matrix_offset[3],
-	        ggd->data.normal_mat3[ggd->normal_axis],
-	        (extrude_arrow_normal_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
-
-	/* Adjust current operator. */
-	/* Don't use 'WM_operator_last_redo' because selection actions will be ignored. */
-	wmOperator *op = CTX_wm_manager(C)->operators.last;
-	bool has_redo = (op && op->type == ggd->ot_extrude);
-	wmOperator *op_xform = has_redo ? op->macro.last : NULL;
-
-	bool adjust_is_flip = false;
-	wmGizmo *gz_adjust = NULL;
-
-	if (has_redo) {
-		gz_adjust = ggd->adjust[1];
-		/* We can't access this from 'ot->last_properties'
-		 * because some properties use skip-save. */
-		RNA_float_get_array(op_xform->ptr, "orient_matrix", &ggd->redo_xform.orient_matrix[0][0]);
-		RNA_boolean_get_array(op_xform->ptr, "constraint_axis", ggd->redo_xform.constraint_axis);
-		RNA_float_get_array(op_xform->ptr, "value", ggd->redo_xform.value);
-
-		/* Set properties for redo. */
-		for (int i = 0; i < 3; i++) {
-			if (ggd->redo_xform.constraint_axis[i]) {
-				adjust_is_flip = ggd->redo_xform.value[i] < 0.0f;
-				ggd->adjust_axis = i;
-				gz_adjust = ggd->adjust[0];
-				break;
-			}
-		}
-	}
-
-	/* Needed for normal orientation. */
-	gizmo_mesh_extrude_orientation_matrix_set(ggd, tbounds.axis);
-
-	/* Location. */
-	for (int i = 0; i < axis_len_used; i++) {
-		WM_gizmo_set_matrix_location(ggd->invoke_xyz_no[i], tbounds.center);
-	}
-	/* Un-hide. */
-	for (int i = 0; i < axis_len_used; i++) {
-		WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, false);
-	}
-
-	if (has_redo) {
-		if (gz_adjust == ggd->adjust[0]) {
-			gizmo_mesh_extrude_orientation_matrix_set_for_adjust(ggd, ggd->redo_xform.orient_matrix);
-			if (adjust_is_flip) {
-				negate_v3(ggd->adjust[0]->matrix_basis[2]);
-			}
-		}
-		WM_gizmo_set_matrix_location(gz_adjust, tbounds.center);
-		WM_gizmo_set_flag(gz_adjust, WM_GIZMO_HIDDEN, false);
-	}
-
-	/* Redo with current settings. */
-	if (has_redo) {
-		for (int i = 0; i < 4; i++) {
-			RNA_enum_set(
-			        ggd->invoke_xyz_no[i]->ptr,
-			        "draw_options",
-			        ((gz_adjust == ggd->adjust[0]) &&
-			         dot_v3v3(ggd->adjust[0]->matrix_basis[2],
-			                  ggd->invoke_xyz_no[i]->matrix_offset[3]) > 0.98f) ? 0 : ED_GIZMO_BUTTON_SHOW_HELPLINE);
-		}
-	}
-	else {
-		for (int i = 0; i < 4; i++) {
-			RNA_enum_set(ggd->invoke_xyz_no[i]->ptr, "draw_options", ED_GIZMO_BUTTON_SHOW_HELPLINE);
-		}
-	}
-
-	/* TODO: skip calculating axis which wont be used (above). */
-	switch (axis_type) {
-		case EXTRUDE_AXIS_NORMAL:
-			for (int i = 0; i < 3; i++) {
-				WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, true);
-			}
-			break;
-		case EXTRUDE_AXIS_XYZ:
-			WM_gizmo_set_flag(ggd->invoke_xyz_no[3], WM_GIZMO_HIDDEN, true);
-			break;
-	}
+  GizmoExtrudeGroup *ggd = gzgroup->customdata;
+
+  for (int i = 0; i < 4; i++) {
+    WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, true);
+  }
+  for (int i = 0; i < 2; i++) {
+    WM_gizmo_set_flag(ggd->adjust[i], WM_GIZMO_HIDDEN, true);
+  }
+
+  if (G.moving) {
+    return;
+  }
+
+  Scene *scene = CTX_data_scene(C);
+
+  int axis_type;
+  {
+    PointerRNA ptr;
+    bToolRef *tref = WM_toolsystem_ref_from_context((bContext *)C);
+    WM_toolsystem_ref_properties_ensure_from_gizmo_group(tref, gzgroup->type, &ptr);
+    axis_type = RNA_property_enum_get(&ptr, ggd->gzgt_axis_type_prop);
+  }
+
+  ggd->data.orientation_type = scene->orientation_slots[SCE_ORIENT_DEFAULT].type;
+  const bool use_normal = ((ggd->data.orientation_type != V3D_ORIENT_NORMAL) ||
+                           (axis_type == EXTRUDE_AXIS_NORMAL));
+  const int axis_len_used = use_normal ? 4 : 3;
+
+  struct TransformBounds tbounds;
+
+  if (use_normal) {
+    struct TransformBounds tbounds_normal;
+    if (!ED_transform_calc_gizmo_stats(C,
+                                       &(struct TransformCalcParams){
+                                           .orientation_type = V3D_ORIENT_NORMAL + 1,
+                                       },
+                                       &tbounds_normal)) {
+      unit_m3(tbounds_normal.axis);
+    }
+    copy_m3_m3(ggd->data.normal_mat3, tbounds_normal.axis);
+  }
+
+  /* TODO(campbell): run second since this modifies the 3D view, it should not. */
+  if (!ED_transform_calc_gizmo_stats(C,
+                                     &(struct TransformCalcParams){
+                                         .orientation_type = ggd->data.orientation_type + 1,
+                                     },
+                                     &tbounds)) {
+    return;
+  }
+
+  /* Main axis is normal. */
+  if (!use_normal) {
+    copy_m3_m3(ggd->data.normal_mat3, tbounds.axis);
+  }
+
+  /* Offset the add icon. */
+  mul_v3_v3fl(ggd->invoke_xyz_no[3]->matrix_offset[3],
+              ggd->data.normal_mat3[ggd->normal_axis],
+              (extrude_arrow_normal_axis_scale * extrude_button_offset_scale) /
+                  extrude_button_scale);
+
+  /* Adjust current operator. */
+  /* Don't use 'WM_operator_last_redo' because selection actions will be ignored. */
+  wmOperator *op = CTX_wm_manager(C)->operators.last;
+  bool has_redo = (op && op->type == ggd->ot_extrude);
+  wmOperator *op_xform = has_redo ? op->macro.last : NULL;
+
+  bool adjust_is_flip = false;
+  wmGizmo *gz_adjust = NULL;
+
+  if (has_redo) {
+    gz_adjust = ggd->adjust[1];
+    /* We can't access this from 'ot->last_properties'
+     * because some properties use skip-save. */
+    RNA_float_get_array(op_xform->ptr, "orient_matrix", &ggd->redo_xform.orient_matrix[0][0]);
+    RNA_boolean_get_array(op_xform->ptr, "constraint_axis", ggd->redo_xform.constraint_axis);
+    RNA_float_get_array(op_xform->ptr, "value", ggd->redo_xform.value);
+
+    /* Set properties for redo. */
+    for (int i = 0; i < 3; i++) {
+      if (ggd->redo_xform.constraint_axis[i]) {
+        adjust_is_flip = ggd->redo_xform.value[i] < 0.0f;
+        ggd->adjust_axis = i;
+        gz_adjust = ggd->adjust[0];
+        break;
+      }
+    }
+  }
+
+  /* Needed for normal orientation. */
+  gizmo_mesh_extrude_orientation_matrix_set(ggd, tbounds.axis);
+
+  /* Location. */
+  for (int i = 0; i < axis_len_used; i++) {
+    WM_gizmo_set_matrix_location(ggd->invoke_xyz_no[i], tbounds.center);
+  }
+  /* Un-hide. */
+  for (int i = 0; i < axis_len_used; i++) {
+    WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, false);
+  }
+
+  if (has_redo) {
+    if (gz_adjust == ggd->adjust[0]) {
+      gizmo_mesh_extrude_orientation_matrix_set_for_adjust(ggd, ggd->redo_xform.orient_matrix);
+      if (adjust_is_flip) {
+        negate_v3(ggd->adjust[0]->matrix_basis[2]);
+      }
+    }
+    WM_gizmo_set_matrix_location(gz_adjust, tbounds.center);
+    WM_gizmo_set_flag(gz_adjust, WM_GIZMO_HIDDEN, false);
+  }
+
+  /* Redo with current settings. */
+  if (has_redo) {
+    for (int i = 0; i < 4; i++) {
+      RNA_enum_set(ggd->invoke_xyz_no[i]->ptr,
+                   "draw_options",
+                   ((gz_adjust == ggd->adjust[0]) &&
+                    dot_v3v3(ggd->adjust[0]->matrix_basis[2],
+                             ggd->invoke_xyz_no[i]->matrix_offset[3]) > 0.98f) ?
+                       0 :
+                       ED_GIZMO_BUTTON_SHOW_HELPLINE);
+    }
+  }
+  else {
+    for (int i = 0; i < 4; i++) {
+      RNA_enum_set(ggd->invoke_xyz_no[i]->ptr, "draw_options", ED_GIZMO_BUTTON_SHOW_HELPLINE);
+    }
+  }
+
+  /* TODO: skip calculating axis which wont be used (above). */
+  switch (axis_type) {
+    case EXTRUDE_AXIS_NORMAL:
+      for (int i = 0; i < 3; i++) {
+        WM_gizmo_set_flag(ggd->invoke_xyz_no[i], WM_GIZMO_HIDDEN, true);
+      }
+      break;
+    case EXTRUDE_AXIS_XYZ:
+      WM_gizmo_set_flag(ggd->invoke_xyz_no[3], WM_GIZMO_HIDDEN, true);
+      break;
+  }
 }
 
 static void gizmo_mesh_extrude_draw_prepare(const bContext *C, wmGizmoGroup *gzgroup)
 {
-	GizmoExtrudeGroup *ggd = gzgroup->customdata;
-	switch (ggd->data.orientation_type) {
-		case V3D_ORIENT_VIEW:
-		{
-			RegionView3D *rv3d = CTX_wm_region_view3d(C);
-			float mat[3][3];
-			copy_m3_m4(mat, rv3d->viewinv);
-			normalize_m3(mat);
-			gizmo_mesh_extrude_orientation_matrix_set(ggd, mat);
-			break;
-		}
-	}
-
-	/* Basic ordering for drawing only. */
-	{
-		RegionView3D *rv3d = CTX_wm_region_view3d(C);
-		LISTBASE_FOREACH (wmGizmo *, gz, &gzgroup->gizmos) {
-			gz->temp.f = dot_v3v3(rv3d->viewinv[2], gz->matrix_offset[3]);
-		}
-		BLI_listbase_sort(&gzgroup->gizmos, WM_gizmo_cmp_temp_fl_reverse);
-
-		if ((ggd->adjust[1]->flag & WM_GIZMO_HIDDEN) == 0) {
-			copy_v3_v3(ggd->adjust[1]->matrix_basis[0], rv3d->viewinv[0]);
-			copy_v3_v3(ggd->adjust[1]->matrix_basis[1], rv3d->viewinv[1]);
-			copy_v3_v3(ggd->adjust[1]->matrix_basis[2], rv3d->viewinv[2]);
-		}
-	}
+  GizmoExtrudeGroup *ggd = gzgroup->customdata;
+  switch (ggd->data.orientation_type) {
+    case V3D_ORIENT_VIEW: {
+      RegionView3D *rv3d = CTX_wm_region_view3d(C);
+      float mat[3][3];
+      copy_m3_m4(mat, rv3d->viewinv);
+      normalize_m3(mat);
+      gizmo_mesh_extrude_orientation_matrix_set(ggd, mat);
+      break;
+    }
+  }
+
+  /* Basic ordering for drawing only. */
+  {
+    RegionView3D *rv3d = CTX_wm_region_view3d(C);
+    LISTBASE_FOREACH (wmGizmo *, gz, &gzgroup->gizmos) {
+      gz->temp.f = dot_v3v3(rv3d->viewinv[2], gz->matrix_offset[3]);
+    }
+    BLI_listbase_sort(&gzgroup->gizmos, WM_gizmo_cmp_temp_fl_reverse);
+
+    if ((ggd->adjust[1]->flag & WM_GIZMO_HIDDEN) == 0) {
+      copy_v3_v3(ggd->adjust[1]->matrix_basis[0], rv3d->viewinv[0]);
+      copy_v3_v3(ggd->adjust[1]->matrix_basis[1], rv3d->viewinv[1]);
+      copy_v3_v3(ggd->adjust[1]->matrix_basis[2], rv3d->viewinv[2]);
+    }
+  }
 }
 
-static void gizmo_mesh_extrude_invoke_prepare(const bContext *UNUSED(C), wmGizmoGroup *gzgroup, wmGizmo *gz)
+static void gizmo_mesh_extrude_invoke_prepare(const bContext *UNUSED(C),
+                                              wmGizmoGroup *gzgroup,
+                                              wmGizmo *gz)
 {
-	GizmoExtrudeGroup *ggd = gzgroup->customdata;
-	if (ELEM(gz, ggd->adjust[0], ggd->adjust[1])) {
-		/* Set properties for redo. */
-		wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
-		PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
-		if (gz == ggd->adjust[0]) {
-			RNA_boolean_set_array(&macroptr, "constraint_axis", ggd->redo_xform.constraint_axis);
-			RNA_float_set_array(&macroptr, "orient_matrix", &ggd->redo_xform.orient_matrix[0][0]);
-			RNA_enum_set(&macroptr, "orient_type", V3D_ORIENT_NORMAL);
-		}
-		RNA_float_set_array(&macroptr, "value", ggd->redo_xform.value);
-	}
-	else {
-		/* Workaround for extrude action modifying normals. */
-		const int i = BLI_array_findindex(ggd->invoke_xyz_no, ARRAY_SIZE(ggd->invoke_xyz_no), &gz);
-		BLI_assert(i != -1);
-		bool use_normal_matrix = false;
-		if (i == 3) {
-			use_normal_matrix = true;
-		}
-		else if (ggd->data.orientation_type == V3D_ORIENT_NORMAL) {
-			use_normal_matrix = true;
-		}
-		if (use_normal_matrix) {
-			wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
-			PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
-			RNA_float_set_array(&macroptr, "orient_matrix", &ggd->data.normal_mat3[0][0]);
-			RNA_enum_set(&macroptr, "orient_type", V3D_ORIENT_NORMAL);
-		}
-	}
+  GizmoExtrudeGroup *ggd = gzgroup->customdata;
+  if (ELEM(gz, ggd->adjust[0], ggd->adjust[1])) {
+    /* Set properties for redo. */
+    wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
+    PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
+    if (gz == ggd->adjust[0]) {
+      RNA_boolean_set_array(&macroptr, "constraint_axis", ggd->redo_xform.constraint_axis);
+      RNA_float_set_array(&macroptr, "orient_matrix", &ggd->redo_xform.orient_matrix[0][0]);
+      RNA_enum_set(&macroptr, "orient_type", V3D_ORIENT_NORMAL);
+    }
+    RNA_float_set_array(&macroptr, "value", ggd->redo_xform.value);
+  }
+  else {
+    /* Workaround for extrude action modifying normals. */
+    const int i = BLI_array_findindex(ggd->invoke_xyz_no, ARRAY_SIZE(ggd->invoke_xyz_no), &gz);
+    BLI_assert(i != -1);
+    bool use_normal_matrix = false;
+    if (i == 3) {
+      use_normal_matrix = true;
+    }
+    else if (ggd->data.orientation_type == V3D_ORIENT_NORMAL) {
+      use_normal_matrix = true;
+    }
+    if (use_normal_matrix) {
+      wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
+      PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
+      RNA_float_set_array(&macroptr, "orient_matrix", &ggd->data.normal_mat3[0][0]);
+      RNA_enum_set(&macroptr, "orient_type", V3D_ORIENT_NORMAL);
+    }
+  }
 }
 
-static void gizmo_mesh_extrude_message_subscribe(
-        const bContext *C, wmGizmoGroup *gzgroup, struct wmMsgBus *mbus)
+static void gizmo_mesh_extrude_message_subscribe(const bContext *C,
+                                                 wmGizmoGroup *gzgroup,
+                                                 struct wmMsgBus *mbus)
 {
-	GizmoExtrudeGroup *ggd = gzgroup->customdata;
-	ARegion *ar = CTX_wm_region(C);
-
-	/* Subscribe to view properties */
-	wmMsgSubscribeValue msg_sub_value_gz_tag_refresh = {
-		.owner = ar,
-		.user_data = gzgroup->parent_gzmap,
-		.notify = WM_gizmo_do_msg_notify_tag_refresh,
-	};
-
-	{
-		WM_msg_subscribe_rna_anon_prop(mbus, TransformOrientationSlot, type, &msg_sub_value_gz_tag_refresh);
-	}
-
-
-	WM_msg_subscribe_rna_params(
-	        mbus,
-	        &(const wmMsgParams_RNA){
-	            .ptr = (PointerRNA){ .type = gzgroup->type->srna, },
-	            .prop = ggd->gzgt_axis_type_prop,
-	        },
-	        &msg_sub_value_gz_tag_refresh, __func__);
+  GizmoExtrudeGroup *ggd = gzgroup->customdata;
+  ARegion *ar = CTX_wm_region(C);
+
+  /* Subscribe to view properties */
+  wmMsgSubscribeValue msg_sub_value_gz_tag_refresh = {
+      .owner = ar,
+      .user_data = gzgroup->parent_gzmap,
+      .notify = WM_gizmo_do_msg_notify_tag_refresh,
+  };
+
+  {
+    WM_msg_subscribe_rna_anon_prop(
+        mbus, TransformOrientationSlot, type, &msg_sub_value_gz_tag_refresh);
+  }
+
+  WM_msg_subscribe_rna_params(mbus,
+                              &(const wmMsgParams_RNA){
+                                  .ptr =
+                                      (PointerRNA){
+                                          .type = gzgroup->type->srna,
+                                      },
+                                  .prop = ggd->gzgt_axis_type_prop,
+                              },
+                              &msg_sub_value_gz_tag_refresh,
+                              __func__);
 }
 
 void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt)
 {
-	gzgt->name = "3D View Extrude";
-	gzgt->idname = "VIEW3D_GGT_xform_extrude";
-
-	gzgt->flag = WM_GIZMOGROUPTYPE_3D;
-
-	gzgt->gzmap_params.spaceid = SPACE_VIEW3D;
-	gzgt->gzmap_params.regionid = RGN_TYPE_WINDOW;
-
-	gzgt->poll = ED_gizmo_poll_or_unlink_delayed_from_tool;
-	gzgt->setup = gizmo_mesh_extrude_setup;
-	gzgt->refresh = gizmo_mesh_extrude_refresh;
-	gzgt->draw_prepare = gizmo_mesh_extrude_draw_prepare;
-	gzgt->invoke_prepare = gizmo_mesh_extrude_invoke_prepare;
-	gzgt->message_subscribe = gizmo_mesh_extrude_message_subscribe;
-
-	static const EnumPropertyItem axis_type_items[] = {
-		{EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Regular", "Only show normal axis"},
-		{EXTRUDE_AXIS_XYZ, "XYZ", 0, "XYZ", "Follow scene orientation"},
-		{0, NULL, 0, NULL, NULL},
-	};
-	RNA_def_enum(gzgt->srna, "axis_type", axis_type_items, 0, "Axis Type", "");
+  gzgt->name = "3D View Extrude";
+  gzgt->idname = "VIEW3D_GGT_xform_extrude";
+
+  gzgt->flag = WM_GIZMOGROUPTYPE_3D;
+
+  gzgt->gzmap_params.spaceid = SPACE_VIEW3D;
+  gzgt->gzmap_params.regionid = RGN_TYPE_WINDOW;
+
+  gzgt->poll = ED_gizmo_poll_or_unlink_delayed_from_tool;
+  gzgt->setup = gizmo_mesh_extrude_setup;
+  gzgt->refresh = gizmo_mesh_extrude_refresh;
+  gzgt->draw_prepare = gizmo_mesh_extrude_draw_prepare;
+  gzgt->invoke_prepare = gizmo_mesh_extrude_invoke_prepare;
+  gzgt->message_subscribe = gizmo_mesh_extrude_message_subscribe;
+
+  static const EnumPropertyItem axis_type_items[] = {
+      {EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Regular", "Only show normal axis"},
+      {EXTRUDE_AXIS_XYZ, "XYZ", 0, "XYZ", "Follow scene orientation"},
+      {0, NULL, 0, NULL, NULL},
+  };
+  RNA_def_enum(gzgt->srna, "axis_type", axis_type_items, 0, "Axis Type", "");
 }
 
 /** \} */