3D View: remove 3D cursor

Use 3D cursor from the scene (was previously used for local-view).

3 files changed, 12 insertions, 7 deletions

diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 8b29c208863..850969cce96 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -227,9 +227,15 @@ void ED_gpencil_add_defaults(struct bContext *C);
 /* set object modes */
 void ED_gpencil_setup_modes(struct bContext *C, struct bGPdata *gpd, int newmode);
 
-void ED_gp_project_stroke_to_plane(struct Object *ob, struct RegionView3D *rv3d, struct bGPDstroke *gps, const float origin[3], const int axis);
-void ED_gp_project_point_to_plane(struct Object *ob, struct RegionView3D *rv3d, const float origin[3], const int axis, struct bGPDspoint *pt);
-void ED_gp_get_drawing_reference(struct View3D *v3d, struct Scene *scene, struct Object *ob, struct bGPDlayer *gpl, char align_flag, float vec[3]);
+void ED_gp_project_stroke_to_plane(
+        const struct Object *ob, const struct RegionView3D *rv3d,
+        struct bGPDstroke *gps, const float origin[3], const int axis);
+void ED_gp_project_point_to_plane(
+        const struct Object *ob, const struct RegionView3D *rv3d,
+        const float origin[3], const int axis, struct bGPDspoint *pt);
+void ED_gp_get_drawing_reference(
+        const struct Scene *scene, const struct Object *ob,
+        struct bGPDlayer *gpl, char align_flag, float vec[3]);
 
 /* set sculpt cursor */
 void ED_gpencil_toggle_brush_cursor(struct bContext *C, bool enable, void *customdata);
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index dd17fa6f434..718c8a48300 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -209,7 +209,7 @@ void ED_transform_calc_orientation_from_type(
  void ED_transform_calc_orientation_from_type_ex(
          const struct bContext *C, float r_mat[3][3],
          /* extra args */
-         struct Scene *scene, struct View3D *v3d, struct RegionView3D *rv3d, struct Object *ob, struct Object *obedit,
+         struct Scene *scene, struct RegionView3D *rv3d, struct Object *ob, struct Object *obedit,
          const short orientation_type, const int pivot_point);
 
 struct TransformBounds {
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index b1d450e2dd9..0e9c2cf3759 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -109,9 +109,8 @@ enum eV3DCursorOrient {
 };
 
 void ED_view3d_background_color_get(const struct Scene *scene, const struct View3D *v3d, float r_color[3]);
-struct View3DCursor *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d);
-void ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, const struct View3D *v3d, float mat[3][3]);
-void ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, const struct View3D *v3d, float mat[4][4]);
+void ED_view3d_cursor3d_calc_mat3(const struct Scene *scene, float mat[3][3]);
+void ED_view3d_cursor3d_calc_mat4(const struct Scene *scene, float mat[4][4]);
 void ED_view3d_cursor3d_position(
         struct bContext *C, const int mval[2],
         const bool use_depth,