[Bf-blender-cvs] [43d0943141c] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Fri Mar 16 06:59:23 CET 2018


Commit: 43d0943141cb745d69d36eb1cf177c22663def61
Author: Campbell Barton
Date:   Sat Mar 17 01:36:36 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB43d0943141cb745d69d36eb1cf177c22663def61

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/mesh/editmesh_add.c
index a21fc2fffde,22cb28f0b1b..292b28c772c
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@@ -60,14 -60,10 +60,15 @@@
  
  /* ********* add primitive operators ************* */
  
 +typedef struct MakePrimitiveData {
 +	float mat[4][4];
 +	bool was_editmode;
 +} MakePrimitiveData;
 +
- static Object *make_prim_init(bContext *C, const char *idname,
-                               const float loc[3], const float rot[3], const unsigned int layer,
-                               MakePrimitiveData *r_creation_data)
+ static Object *make_prim_init(
+         bContext *C, const char *idname,
 -        float *dia, float mat[4][4],
 -        bool *was_editmode, const float loc[3], const float rot[3], const unsigned int layer)
++        const float loc[3], const float rot[3], const unsigned int layer,
++        MakePrimitiveData *r_creation_data)
  {
  	Object *obedit = CTX_data_edit_object(C);
  
diff --cc source/blender/editors/mesh/editmesh_extrude.c
index 18320ec65f5,2c98f05bd27..aee9785ea83
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@@ -53,19 -52,12 +53,23 @@@
  #include "ED_transform.h"
  #include "ED_view3d.h"
  
 +#include "UI_resources.h"
 +
 +#include "MEM_guardedalloc.h"
 +
  #include "mesh_intern.h"  /* own include */
  
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
 +#include "ED_util.h"
 +#endif
 +
+ /* -------------------------------------------------------------------- */
+ /** \name Extrude Internal Utilities
+  * \{ */
+ 
  static void edbm_extrude_edge_exclude_mirror(
          Object *obedit, BMEditMesh *em,
          const char hflag,
@@@ -806,385 -824,14 +852,384 @@@ void MESH_OT_spin(wmOperatorType *ot
  	                     "Center", "Center in global view space", -1e4f, 1e4f);
  	RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -1.0f, 1.0f);
  
 +#ifdef USE_MANIPULATOR
 +	WM_manipulatorgrouptype_append(MESH_WGT_spin);
 +#endif
  }
  
 -/** \} */
 +
 +#ifdef USE_MANIPULATOR
  
  /* -------------------------------------------------------------------- */
- 
- /** \name Spin Manipulator
+ /** \name Screw Operator
   * \{ */
  
 +typedef struct ManipulatorSpinGroup {
 +	/* Arrow to change plane depth. */
 +	struct wmManipulator *translate_z;
 +	/* Translate XYZ */
 +	struct wmManipulator *translate_c;
 +	/* For grabbing the manipulator and moving freely. */
 +	struct wmManipulator *rotate_c;
 +	/* Spin angle */
 +	struct wmManipulator *angle_z;
 +
 +	/* We could store more vars here! */
 +	struct {
 +		bContext *context;
 +		wmOperator *op;
 +		PropertyRNA *prop_axis_co;
 +		PropertyRNA *prop_axis_no;
 +		PropertyRNA *prop_angle;
 +
 +		float rotate_axis[3];
 +		float rotate_up[3];
 +	} data;
 +} ManipulatorSpinGroup;
 +
 +/**
 + * XXX. calling redo from property updates is not great.
 + * This is needed because changing the RNA doesn't cause a redo
 + * and we're not using operator UI which does just this.
 + */
 +static void manipulator_spin_exec(ManipulatorSpinGroup *man)
 +{
 +	wmOperator *op = man->data.op;
 +	if (op == WM_operator_last_redo((bContext *)man->data.context)) {
 +		ED_undo_operator_repeat((bContext *)man->data.context, op);
 +	}
 +}
 +
 +static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man)
 +{
 +	wmOperator *op = man->data.op;
 +
 +	float plane_co[3], plane_no[3];
 +
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
 +
 +	WM_manipulator_set_matrix_location(man->translate_z, plane_co);
 +	WM_manipulator_set_matrix_location(man->rotate_c, plane_co);
 +	WM_manipulator_set_matrix_location(man->angle_z, plane_co);
 +	/* translate_c location comes from the property. */
 +
 +	WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no);
 +	WM_manipulator_set_matrix_rotation_from_z_axis(man->angle_z, plane_no);
 +
 +	WM_manipulator_set_scale(man->translate_c, 0.2);
 +
 +	RegionView3D *rv3d = ED_view3d_context_rv3d(man->data.context);
 +	if (rv3d) {
 +		normalize_v3_v3(man->data.rotate_axis, rv3d->viewinv[2]);
 +		normalize_v3_v3(man->data.rotate_up, rv3d->viewinv[1]);
 +
 +		/* ensure its orthogonal */
 +		project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis);
 +		normalize_v3(man->data.rotate_up);
 +
 +		WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no);
 +		WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, plane_no, man->data.rotate_axis);
 +
 +		/* show the axis instead of mouse cursor */
 +		RNA_enum_set(man->rotate_c->ptr, "draw_options",
 +		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR |
 +		             ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y);
 +
 +	}
 +}
 +
 +/* depth callbacks */
 +static void manipulator_spin_prop_depth_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 1);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	float plane_co[3], plane_no[3];
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
 +
 +	value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]);
 +}
 +
 +static void manipulator_spin_prop_depth_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	const float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 1);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	float plane_co[3], plane[4];
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane);
 +	normalize_v3(plane);
 +
 +	plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]);
 +
 +	/* Keep our location, may be offset simply to be inside the viewport. */
 +	closest_to_plane_normalized_v3(plane_co, plane, plane_co);
 +
 +	RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, plane_co);
 +
 +	manipulator_spin_exec(man);
 +}
 +
 +/* translate callbacks */
 +static void manipulator_spin_prop_translate_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 3);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, value);
 +}
 +
 +static void manipulator_spin_prop_translate_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +
 +	BLI_assert(mpr_prop->type->array_length == 3);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, value);
 +
 +	manipulator_spin_exec(man);
 +}
 +
 +/* angle callbacks */
 +static void manipulator_spin_prop_axis_angle_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 1);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	float plane_no[4];
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
 +	normalize_v3(plane_no);
 +
 +	float plane_no_proj[3];
 +	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
 +
 +	if (!is_zero_v3(plane_no_proj)) {
 +		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
 +		value[0] = angle;
 +	}
 +	else {
 +		value[0] = 0.0f;
 +	}
 +}
 +
 +static void manipulator_spin_prop_axis_angle_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	const float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 1);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +	float plane_no[4];
 +	RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
 +	normalize_v3(plane_no);
 +
 +	float plane_no_proj[3];
 +	project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
 +
 +	if (!is_zero_v3(plane_no_proj)) {
 +		const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
 +		const float angle_delta = angle - angle_compat_rad(value[0], angle);
 +		if (angle_delta != 0.0f) {
 +			float mat[3][3];
 +			axis_angle_normalized_to_mat3(mat, man->data.rotate_axis, angle_delta);
 +			mul_m3_v3(mat, plane_no);
 +
 +			/* re-normalize - seems acceptable */
 +			RNA_property_float_set_array(op->ptr, man->data.prop_axis_no, plane_no);
 +
 +			manipulator_spin_exec(man);
 +		}
 +	}
 +}
 +
 +/* angle callbacks */
 +static void manipulator_spin_prop_angle_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	float *value = value_p;
 +
 +	BLI_assert(mpr_prop->type->array_length == 1);
 +	UNUSED_VARS_NDEBUG(mpr_prop);
 +	value[0] = RNA_property_float_get(op->ptr, man->data.prop_angle);
 +}
 +
 +static void manipulator_spin_prop_angle_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +	ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
 +	wmOperator *op = man->data.op;
 +	BLI_assert(mpr_prop->type->array_lengt

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list