3D View: remove 3D cursor

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

3 files changed, 5 insertions, 14 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index c4eb0aad337..8b592d3b7ef 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -163,13 +163,8 @@ static EnumPropertyItem lightprobe_type_items[] = {
 
 void ED_object_location_from_view(bContext *C, float loc[3])
 {
-	View3D *v3d = CTX_wm_view3d(C);
-	Scene *scene = CTX_data_scene(C);
-	const float *cursor;
-
-	cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
-
-	copy_v3_v3(loc, cursor);
+	const Scene *scene = CTX_data_scene(C);
+	copy_v3_v3(loc, scene->cursor.location);
 }
 
 void ED_object_rotation_from_quat(float rot[3], const float viewquat[4], const char align_axis)
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 65ac910a237..e2574cf3813 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -828,7 +828,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 	else {
 		/* get the view settings if 'around' isn't set and the view is available */
 		View3D *v3d = CTX_wm_view3d(C);
-		copy_v3_v3(cursor, ED_view3d_cursor3d_get(scene, v3d)->location);
+		copy_v3_v3(cursor, scene->cursor.location);
 		if (v3d && !RNA_struct_property_is_set(op->ptr, "center"))
 			around = scene->toolsettings->transform_pivot_point;
 	}
diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c
index 008593739ba..d28ed71c382 100644
--- a/source/blender/editors/object/object_warp.c
+++ b/source/blender/editors/object/object_warp.c
@@ -223,12 +223,8 @@ static int object_warp_verts_exec(bContext *C, wmOperator *op)
 			RNA_property_float_get_array(op->ptr, prop_center, center);
 		}
 		else {
-			Scene *scene = CTX_data_scene(C);
-			View3D *v3d = CTX_wm_view3d(C);
-			const float *cursor;
-
-			cursor = ED_view3d_cursor3d_get(scene, v3d)->location;
-			copy_v3_v3(center, cursor);
+			const Scene *scene = CTX_data_scene(C);
+			copy_v3_v3(center, scene->cursor.location);
 
 			RNA_property_float_set_array(op->ptr, prop_center, center);
 		}