Merge branch 'hair_guides' into hair_guides_groominghair_guides_grooming

1 files changed, 10 insertions, 6 deletions

diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h
index 39a58929b7c..41488baa964 100644
--- a/source/blender/editors/include/ED_gizmo_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -40,7 +40,11 @@ void ED_gizmotypes_dial_3d(void);
 void ED_gizmotypes_grab_3d(void);
 void ED_gizmotypes_facemap_3d(void);
 void ED_gizmotypes_primitive_3d(void);
+void ED_gizmotypes_blank_3d(void);
 
+struct bContext;
+struct Object;
+struct Scene;
 struct wmGizmo;
 struct wmGizmoGroup;
 
@@ -53,13 +57,13 @@ struct wmGizmoGroup;
 
 /* gizmo_library_presets.c */
 void ED_gizmo_draw_preset_box(
-        const struct wmGizmo *mpr, float mat[4][4], int select_id);
+        const struct wmGizmo *gz, float mat[4][4], int select_id);
 void ED_gizmo_draw_preset_arrow(
-        const struct wmGizmo *mpr, float mat[4][4], int axis, int select_id);
+        const struct wmGizmo *gz, float mat[4][4], int axis, int select_id);
 void ED_gizmo_draw_preset_circle(
-        const struct wmGizmo *mpr, float mat[4][4], int axis, int select_id);
+        const struct wmGizmo *gz, float mat[4][4], int axis, int select_id);
 void ED_gizmo_draw_preset_facemap(
-        const struct bContext *C, const struct wmGizmo *mpr, struct Scene *scene,
+        const struct bContext *C, const struct wmGizmo *gz, struct Scene *scene,
         struct Object *ob,  const int facemap, int select_id);
 
 
@@ -87,8 +91,8 @@ enum {
 	ED_GIZMO_ARROW_DRAW_FLAG_STEM      = (1 << 0),
 };
 
-void ED_gizmo_arrow3d_set_ui_range(struct wmGizmo *mpr, const float min, const float max);
-void ED_gizmo_arrow3d_set_range_fac(struct wmGizmo *mpr, const float range_fac);
+void ED_gizmo_arrow3d_set_ui_range(struct wmGizmo *gz, const float min, const float max);
+void ED_gizmo_arrow3d_set_range_fac(struct wmGizmo *gz, const float range_fac);
 
 /* -------------------------------------------------------------------- */
 /* 2D Arrow Gizmo */