1 files changed, 68 insertions, 68 deletions

diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
index b93b87b1efa..b45f3d8a242 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
@@ -71,7 +71,7 @@
 // #define USE_GIZMO_CUSTOM_DIAL
 
 static int gizmo_dial_modal(
-        bContext *C, wmGizmo *mpr, const wmEvent *event,
+        bContext *C, wmGizmo *gz, const wmEvent *event,
         eWM_GizmoFlagTweak tweak_flag);
 
 typedef struct DialInteraction {
@@ -101,30 +101,30 @@ typedef struct DialInteraction {
 /**
  * We can't use this for the #wmGizmoType.matrix_basis_get callback, it conflicts with depth picking.
  */
-static void dial_calc_matrix(const wmGizmo *mpr, float mat[4][4])
+static void dial_calc_matrix(const wmGizmo *gz, float mat[4][4])
 {
 	float rot[3][3];
 	const float up[3] = {0.0f, 0.0f, 1.0f};
 
-	rotation_between_vecs_to_mat3(rot, up, mpr->matrix_basis[2]);
+	rotation_between_vecs_to_mat3(rot, up, gz->matrix_basis[2]);
 	copy_m4_m3(mat, rot);
-	copy_v3_v3(mat[3], mpr->matrix_basis[3]);
+	copy_v3_v3(mat[3], gz->matrix_basis[3]);
 }
 
 /* -------------------------------------------------------------------- */
 
 static void dial_geom_draw(
-        const wmGizmo *mpr, const float color[4], const bool select,
+        const wmGizmo *gz, const float color[4], const bool select,
         float axis_modal_mat[4][4], float clip_plane[4])
 {
 #ifdef USE_GIZMO_CUSTOM_DIAL
 	UNUSED_VARS(dial, col, axis_modal_mat, clip_plane);
 	wm_gizmo_geometryinfo_draw(&wm_gizmo_geom_data_dial, select);
 #else
-	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
 	const bool filled = (draw_options & ED_GIZMO_DIAL_DRAW_FLAG_FILL) != 0;
 
-	GPU_line_width(mpr->line_width);
+	GPU_line_width(gz->line_width);
 
 	Gwn_VertFormat *format = immVertexFormat();
 	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
@@ -181,9 +181,9 @@ static void dial_ghostarc_draw_helpline(const float angle, const float co_outer[
 }
 
 static void dial_ghostarc_draw(
-        const wmGizmo *mpr, const float angle_ofs, const float angle_delta, const float color[4])
+        const wmGizmo *gz, const float angle_ofs, const float angle_delta, const float color[4])
 {
-	const float width_inner = DIAL_WIDTH - mpr->line_width * 0.5f / U.gizmo_size;
+	const float width_inner = DIAL_WIDTH - gz->line_width * 0.5f / U.gizmo_size;
 
 	Gwn_VertFormat *format = immVertexFormat();
 	uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
@@ -196,24 +196,24 @@ static void dial_ghostarc_draw(
 
 static void dial_ghostarc_get_angles(
         struct Depsgraph *depsgraph,
-        const wmGizmo *mpr,
+        const wmGizmo *gz,
         const wmEvent *event,
         const ARegion *ar, const View3D *v3d,
         float mat[4][4], const float co_outer[3],
         float *r_start, float *r_delta)
 {
-	DialInteraction *inter = mpr->interaction_data;
+	DialInteraction *inter = gz->interaction_data;
 	const RegionView3D *rv3d = ar->regiondata;
 	const float mval[2] = {event->x - ar->winrct.xmin, event->y - ar->winrct.ymin};
 
 	/* we might need to invert the direction of the angles */
 	float view_vec[3], axis_vec[3];
-	ED_view3d_global_to_vector(rv3d, mpr->matrix_basis[3], view_vec);
-	normalize_v3_v3(axis_vec, mpr->matrix_basis[2]);
+	ED_view3d_global_to_vector(rv3d, gz->matrix_basis[3], view_vec);
+	normalize_v3_v3(axis_vec, gz->matrix_basis[2]);
 
 	float proj_outer_rel[3];
 	mul_v3_project_m4_v3(proj_outer_rel, mat, co_outer);
-	sub_v3_v3(proj_outer_rel, mpr->matrix_basis[3]);
+	sub_v3_v3(proj_outer_rel, gz->matrix_basis[3]);
 
 	float proj_mval_new_rel[3];
 	float proj_mval_init_rel[3];
@@ -221,7 +221,7 @@ static void dial_ghostarc_get_angles(
 	float ray_co[3], ray_no[3];
 	float ray_lambda;
 
-	plane_from_point_normal_v3(dial_plane, mpr->matrix_basis[3], axis_vec);
+	plane_from_point_normal_v3(dial_plane, gz->matrix_basis[3], axis_vec);
 
 	if (!ED_view3d_win_to_ray(depsgraph, ar, v3d, inter->init_mval, ray_co, ray_no, false) ||
 	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
@@ -229,7 +229,7 @@ static void dial_ghostarc_get_angles(
 		goto fail;
 	}
 	madd_v3_v3v3fl(proj_mval_init_rel, ray_co, ray_no, ray_lambda);
-	sub_v3_v3(proj_mval_init_rel, mpr->matrix_basis[3]);
+	sub_v3_v3(proj_mval_init_rel, gz->matrix_basis[3]);
 
 	if (!ED_view3d_win_to_ray(depsgraph, ar, v3d, mval, ray_co, ray_no, false) ||
 	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
@@ -237,14 +237,14 @@ static void dial_ghostarc_get_angles(
 		goto fail;
 	}
 	madd_v3_v3v3fl(proj_mval_new_rel, ray_co, ray_no, ray_lambda);
-	sub_v3_v3(proj_mval_new_rel, mpr->matrix_basis[3]);
+	sub_v3_v3(proj_mval_new_rel, gz->matrix_basis[3]);
 
-	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
 
 	/* Start direction from mouse or set by user */
 	const float *proj_init_rel =
 	        (draw_options & ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_START_Y) ?
-	        mpr->matrix_basis[1] : proj_mval_init_rel;
+	        gz->matrix_basis[1] : proj_mval_init_rel;
 
 	/* return angles */
 	const float start = angle_wrap_rad(angle_signed_on_axis_v3v3_v3(proj_outer_rel, proj_init_rel, axis_vec));
@@ -274,7 +274,7 @@ fail:
 }
 
 static void dial_draw_intern(
-        const bContext *C, wmGizmo *mpr,
+        const bContext *C, wmGizmo *gz,
         const bool select, const bool highlight, float clip_plane[4])
 {
 	float matrix_basis_adjust[4][4];
@@ -283,12 +283,12 @@ static void dial_draw_intern(
 
 	BLI_assert(CTX_wm_area(C)->spacetype == SPACE_VIEW3D);
 
-	gizmo_color_get(mpr, highlight, color);
+	gizmo_color_get(gz, highlight, color);
 
-	dial_calc_matrix(mpr, matrix_basis_adjust);
+	dial_calc_matrix(gz, matrix_basis_adjust);
 
 	WM_gizmo_calc_matrix_final_params(
-	        mpr, &((struct WM_GizmoMatrixParams) {
+	        gz, &((struct WM_GizmoMatrixParams) {
 	            .matrix_basis = (void *)matrix_basis_adjust,
 	        }), matrix_final);
 
@@ -296,17 +296,17 @@ static void dial_draw_intern(
 	gpuMultMatrix(matrix_final);
 
 	/* draw rotation indicator arc first */
-	if ((mpr->flag & WM_GIZMO_DRAW_VALUE) &&
-	    (mpr->state & WM_GIZMO_STATE_MODAL))
+	if ((gz->flag & WM_GIZMO_DRAW_VALUE) &&
+	    (gz->state & WM_GIZMO_STATE_MODAL))
 	{
 		const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; /* coordinate at which the arc drawing will be started */
 
-		DialInteraction *inter = mpr->interaction_data;
+		DialInteraction *inter = gz->interaction_data;
 
 		/* XXX, View3D rotation gizmo doesn't call modal. */
-		if (!WM_gizmo_target_property_is_valid_any(mpr)) {
+		if (!WM_gizmo_target_property_is_valid_any(gz)) {
 			wmWindow *win = CTX_wm_window(C);
-			gizmo_dial_modal((bContext *)C, mpr, win->eventstate, 0);
+			gizmo_dial_modal((bContext *)C, gz, win->eventstate, 0);
 		}
 
 		float angle_ofs = inter->output.angle_ofs;
@@ -315,14 +315,14 @@ static void dial_draw_intern(
 		/* draw! */
 		for (int i = 0; i < 2; i++) {
 			GPU_polygon_smooth(false);
-			dial_ghostarc_draw(mpr, angle_ofs, angle_delta, (const float[4]){0.8f, 0.8f, 0.8f, 0.4f});
+			dial_ghostarc_draw(gz, angle_ofs, angle_delta, (const float[4]){0.8f, 0.8f, 0.8f, 0.4f});
 			GPU_polygon_smooth(true);
 
 			dial_ghostarc_draw_helpline(angle_ofs, co_outer, color); /* starting position */
 			dial_ghostarc_draw_helpline(angle_ofs + angle_delta, co_outer, color); /* starting position + current value */
 
 			if (i == 0) {
-				const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+				const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
 				if ((draw_options & ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_MIRROR) == 0) {
 					break;
 				}
@@ -333,15 +333,15 @@ static void dial_draw_intern(
 	}
 
 	/* draw actual dial gizmo */
-	dial_geom_draw(mpr, color, select, matrix_basis_adjust, clip_plane);
+	dial_geom_draw(gz, color, select, matrix_basis_adjust, clip_plane);
 
 	gpuPopMatrix();
 }
 
-static void gizmo_dial_draw_select(const bContext *C, wmGizmo *mpr, int select_id)
+static void gizmo_dial_draw_select(const bContext *C, wmGizmo *gz, int select_id)
 {
 	float clip_plane_buf[4];
-	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
 	float *clip_plane = (draw_options & ED_GIZMO_DIAL_DRAW_FLAG_CLIP) ? clip_plane_buf : NULL;
 
 	/* enable clipping if needed */
@@ -350,25 +350,25 @@ static void gizmo_dial_draw_select(const bContext *C, wmGizmo *mpr, int select_i
 		RegionView3D *rv3d = ar->regiondata;
 
 		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
-		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], mpr->matrix_basis[3]);
-		clip_plane[3] += DIAL_CLIP_BIAS * mpr->scale_final;
+		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], gz->matrix_basis[3]);
+		clip_plane[3] += DIAL_CLIP_BIAS * gz->scale_final;
 		glEnable(GL_CLIP_DISTANCE0);
 	}
 
 	GPU_select_load_id(select_id);
-	dial_draw_intern(C, mpr, true, false, clip_plane);
+	dial_draw_intern(C, gz, true, false, clip_plane);
 
 	if (clip_plane) {
 		glDisable(GL_CLIP_DISTANCE0);
 	}
 }
 
-static void gizmo_dial_draw(const bContext *C, wmGizmo *mpr)
+static void gizmo_dial_draw(const bContext *C, wmGizmo *gz)
 {
-	const bool is_modal = mpr->state & WM_GIZMO_STATE_MODAL;
-	const bool is_highlight = (mpr->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
+	const bool is_modal = gz->state & WM_GIZMO_STATE_MODAL;
+	const bool is_highlight = (gz->state & WM_GIZMO_STATE_HIGHLIGHT) != 0;
 	float clip_plane_buf[4];
-	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
+	const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
 	float *clip_plane = (!is_modal && (draw_options & ED_GIZMO_DIAL_DRAW_FLAG_CLIP)) ? clip_plane_buf : NULL;
 
 	/* enable clipping if needed */
@@ -377,14 +377,14 @@ static void gizmo_dial_draw(const bContext *C, wmGizmo *mpr)
 		RegionView3D *rv3d = ar->regiondata;
 
 		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
-		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], mpr->matrix_basis[3]);
-		clip_plane[3] += DIAL_CLIP_BIAS * mpr->scale_final;
+		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], gz->matrix_basis[3]);
+		clip_plane[3] += DIAL_CLIP_BIAS * gz->scale_final;
 
 		glEnable(GL_CLIP_DISTANCE0);
 	}
 
 	GPU_blend(true);
-	dial_draw_intern(C, mpr, false, is_highlight, clip_plane);
+	dial_draw_intern(C, gz, false, is_highlight, clip_plane);
 	GPU_blend(false);
 
 	if (clip_plane) {
@@ -393,7 +393,7 @@ static void gizmo_dial_draw(const bContext *C, wmGizmo *mpr)
 }
 
 static int gizmo_dial_modal(
-        bContext *C, wmGizmo *mpr, const wmEvent *event,
+        bContext *C, wmGizmo *gz, const wmEvent *event,
         eWM_GizmoFlagTweak UNUSED(tweak_flag))
 {
 	const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; /* coordinate at which the arc drawing will be started */
@@ -401,48 +401,48 @@ static int gizmo_dial_modal(
 
 	float matrix[4][4];
 
-	dial_calc_matrix(mpr, matrix);
+	dial_calc_matrix(gz, matrix);
 
 	dial_ghostarc_get_angles(
 	        CTX_data_depsgraph(C),
-	        mpr, event, CTX_wm_region(C), CTX_wm_view3d(C), matrix, co_outer, &angle_ofs, &angle_delta);
+	        gz, event, CTX_wm_region(C), CTX_wm_view3d(C), matrix, co_outer, &angle_ofs, &angle_delta);
 
-	DialInteraction *inter = mpr->interaction_data;
+	DialInteraction *inter = gz->interaction_data;
 
 	inter->output.angle_delta = angle_delta;
 	inter->output.angle_ofs = angle_ofs;
 
 	/* set the property for the operator and call its modal function */
-	wmGizmoProperty *mpr_prop = WM_gizmo_target_property_find(mpr, "offset");
-	if (WM_gizmo_target_property_is_valid(mpr_prop)) {
-		WM_gizmo_target_property_value_set(C, mpr, mpr_prop, inter->init_prop_angle + angle_delta);
+	wmGizmoProperty *gz_prop = WM_gizmo_target_property_find(gz, "offset");
+	if (WM_gizmo_target_property_is_valid(gz_prop)) {
+		WM_gizmo_target_property_value_set(C, gz, gz_prop, inter->init_prop_angle + angle_delta);
 	}
 	return OPERATOR_RUNNING_MODAL;
 }
 
 
-static void gizmo_dial_setup(wmGizmo *mpr)
+static void gizmo_dial_setup(wmGizmo *gz)
 {
 	const float dir_default[3] = {0.0f, 0.0f, 1.0f};
 
 	/* defaults */
-	copy_v3_v3(mpr->matrix_basis[2], dir_default);
+	copy_v3_v3(gz->matrix_basis[2], dir_default);
 }
 
 static int gizmo_dial_invoke(
-        bContext *UNUSED(C), wmGizmo *mpr, const wmEvent *event)
+        bContext *UNUSED(C), wmGizmo *gz, const wmEvent *event)
 {
 	DialInteraction *inter = MEM_callocN(sizeof(DialInteraction), __func__);
 
 	inter->init_mval[0] = event->mval[0];
 	inter->init_mval[1] = event->mval[1];
 
-	wmGizmoProperty *mpr_prop = WM_gizmo_target_property_find(mpr, "offset");
-	if (WM_gizmo_target_property_is_valid(mpr_prop)) {
-		inter->init_prop_angle = WM_gizmo_target_property_value_get(mpr, mpr_prop);
+	wmGizmoProperty *gz_prop = WM_gizmo_target_property_find(gz, "offset");
+	if (WM_gizmo_target_property_is_valid(gz_prop)) {
+		inter->init_prop_angle = WM_gizmo_target_property_value_get(gz, gz_prop);
 	}
 
-	mpr->interaction_data = inter;
+	gz->interaction_data = inter;
 
 	return OPERATOR_RUNNING_MODAL;
 }
@@ -452,19 +452,19 @@ static int gizmo_dial_invoke(
  *
  * \{ */
 
-static void GIZMO_WT_dial_3d(wmGizmoType *wt)
+static void GIZMO_GT_dial_3d(wmGizmoType *gzt)
 {
 	/* identifiers */
-	wt->idname = "GIZMO_WT_dial_3d";
+	gzt->idname = "GIZMO_GT_dial_3d";
 
 	/* api callbacks */
-	wt->draw = gizmo_dial_draw;
-	wt->draw_select = gizmo_dial_draw_select;
-	wt->setup = gizmo_dial_setup;
-	wt->invoke = gizmo_dial_invoke;
-	wt->modal = gizmo_dial_modal;
+	gzt->draw = gizmo_dial_draw;
+	gzt->draw_select = gizmo_dial_draw_select;
+	gzt->setup = gizmo_dial_setup;
+	gzt->invoke = gizmo_dial_invoke;
+	gzt->modal = gizmo_dial_modal;
 
-	wt->struct_size = sizeof(wmGizmo);
+	gzt->struct_size = sizeof(wmGizmo);
 
 	/* rna */
 	static EnumPropertyItem rna_enum_draw_options[] = {
@@ -474,14 +474,14 @@ static void GIZMO_WT_dial_3d(wmGizmoType *wt)
 		{ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_START_Y, "ANGLE_START_Y", 0, "Angle Start Y", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
-	RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
+	RNA_def_enum_flag(gzt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
 
-	WM_gizmotype_target_property_def(wt, "offset", PROP_FLOAT, 1);
+	WM_gizmotype_target_property_def(gzt, "offset", PROP_FLOAT, 1);
 }
 
 void ED_gizmotypes_dial_3d(void)
 {
-	WM_gizmotype_append(GIZMO_WT_dial_3d);
+	WM_gizmotype_append(GIZMO_GT_dial_3d);
 }
 
 /** \} */