1 files changed, 70 insertions, 3 deletions

diff --git a/source/blender/editors/manipulator_library/manipulator_library_utils.c b/source/blender/editors/manipulator_library/manipulator_library_utils.c
index 9c182fcf4bc..fb1d1f89626 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_utils.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_utils.c
@@ -36,6 +36,11 @@
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 
+#include "DNA_view3d_types.h"
+#include "DNA_screen_types.h"
+
+#include "ED_view3d.h"
+
 #include "RNA_access.h"
 
 #include "WM_api.h"
@@ -121,9 +126,13 @@ void manipulator_property_data_update(
 	if (constrained) {
 		if ((data->flag & MANIPULATOR_CUSTOM_RANGE_SET) == 0) {
 			float range[2];
-			WM_manipulator_target_property_range_get(mpr, mpr_prop, range);
-			data->range = range[1] - range[0];
-			data->min = range[0];
+			if (WM_manipulator_target_property_range_get(mpr, mpr_prop, range)) {
+				data->range = range[1] - range[0];
+				data->min = range[0];
+			}
+			else {
+				BLI_assert(0);
+			}
 		}
 		data->offset = manipulator_offset_from_value_constr(data->range_fac, data->min, data->range, value, inverted);
 	}
@@ -152,3 +161,61 @@ void manipulator_color_get(
 		copy_v4_v4(r_col, mpr->color);
 	}
 }
+
+/* -------------------------------------------------------------------- */
+
+/**
+ * Takes mouse coordinates and returns them in relation to the manipulator.
+ * Both 2D & 3D supported, use so we can use 2D manipulators in the 3D view.
+ */
+bool manipulator_window_project_2d(
+        bContext *C, const struct wmManipulator *mpr, const float mval[2], int axis, bool use_offset,
+        float r_co[2])
+{
+	float mat[4][4];
+	{
+		float mat_identity[4][4];
+		struct WM_ManipulatorMatrixParams params = {NULL};
+		if (use_offset == false) {
+			unit_m4(mat_identity);
+			params.matrix_offset = mat_identity;
+		}
+		WM_manipulator_calc_matrix_final_params(mpr, &params, mat);
+	}
+
+	/* rotate mouse in relation to the center and relocate it */
+	if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) {
+		/* For 3d views, transform 2D mouse pos onto plane. */
+		View3D *v3d = CTX_wm_view3d(C);
+		ARegion *ar = CTX_wm_region(C);
+
+		float plane[4];
+
+		plane_from_point_normal_v3(plane, mat[3], mat[2]);
+
+		float ray_origin[3], ray_direction[3];
+
+		if (ED_view3d_win_to_ray(ar, v3d, mval, ray_origin, ray_direction, false)) {
+			float lambda;
+			if (isect_ray_plane_v3(ray_origin, ray_direction, plane, &lambda, true)) {
+				float co[3];
+				madd_v3_v3v3fl(co, ray_origin, ray_direction, lambda);
+				float imat[4][4];
+				invert_m4_m4(imat, mat);
+				mul_m4_v3(imat, co);
+				r_co[0] = co[(axis + 1) % 3];
+				r_co[1] = co[(axis + 2) % 3];
+				return true;
+			}
+		}
+		return false;
+	}
+	else {
+		float co[3] = {mval[0], mval[1], 0.0f};
+		float imat[4][4];
+		invert_m4_m4(imat, mat);
+		mul_m4_v3(imat, co);
+		copy_v2_v2(r_co, co);
+		return true;
+	}
+}