[Bf-blender-cvs] [5ac5729ea76] custom-manipulators: Remove unneeded length arg
Campbell Barton
noreply at git.blender.org
Thu Jun 22 05:53:57 CEST 2017
Commit: 5ac5729ea766cedb1143e27c70300db6848d0f6f
Author: Campbell Barton
Date: Thu Jun 22 13:58:10 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB5ac5729ea766cedb1143e27c70300db6848d0f6f
Remove unneeded length arg
Was also missing assignment to wmManipulatorProperty.type
===================================================================
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
M source/blender/windowmanager/manipulators/wm_manipulator_fn.h
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index 4d301c009ee..2a80d74e4e7 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -456,14 +456,14 @@ static void manipulator_mesh_bisect_update_from_op(ManipulatorGroup *man)
/* depth callbacks */
static void manipulator_bisect_prop_depth_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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_plane_co, plane_co);
@@ -473,14 +473,14 @@ static void manipulator_bisect_prop_depth_get(
}
static void manipulator_bisect_prop_depth_set(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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_plane_co, plane_co);
@@ -499,24 +499,28 @@ static void manipulator_bisect_prop_depth_set(
/* translate callbacks */
static void manipulator_bisect_prop_translate_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 3);
+ BLI_assert(mpr_prop->type->array_length == 3);
+ UNUSED_VARS_NDEBUG(mpr_prop);
+
RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, value);
}
static void manipulator_bisect_prop_translate_set(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 3);
+ BLI_assert(mpr_prop->type->array_length == 3);
+ UNUSED_VARS_NDEBUG(mpr_prop);
+
RNA_property_float_set_array(op->ptr, man->data.prop_plane_co, value);
manipulator_bisect_exec(man);
@@ -524,14 +528,14 @@ static void manipulator_bisect_prop_translate_set(
/* angle callbacks */
static void manipulator_bisect_prop_angle_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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_plane_no, plane_no);
@@ -550,14 +554,14 @@ static void manipulator_bisect_prop_angle_get(
}
static void manipulator_bisect_prop_angle_set(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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_plane_no, plane_no);
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 32f5dcd5526..75e901a6e1f 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -890,14 +890,14 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man)
/* depth callbacks */
static void manipulator_spin_prop_depth_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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);
@@ -907,14 +907,14 @@ static void manipulator_spin_prop_depth_get(
}
static void manipulator_spin_prop_depth_set(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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);
@@ -933,24 +933,28 @@ static void manipulator_spin_prop_depth_set(
/* translate callbacks */
static void manipulator_spin_prop_translate_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 3);
+ 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 *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 3);
+ 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);
@@ -958,14 +962,14 @@ static void manipulator_spin_prop_translate_set(
/* angle callbacks */
static void manipulator_spin_prop_axis_angle_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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);
@@ -984,14 +988,14 @@ static void manipulator_spin_prop_axis_angle_get(
}
static void manipulator_spin_prop_axis_angle_set(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
- UNUSED_VARS_NDEBUG(value_len);
+ 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);
@@ -1018,22 +1022,24 @@ static void manipulator_spin_prop_axis_angle_set(
/* angle callbacks */
static void manipulator_spin_prop_angle_get(
- const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop), void *UNUSED(user_data),
- float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
- BLI_assert(value_len == 1);
+ 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 *UNUSED(mpr_prop), void *UNUSED(user_data),
- const float *value, uint value_len)
+ const wmManipulator *mpr, wmManipulatorProperty *mpr_prop, void *UNUSED(user_data),
+ const float *value)
{
ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
wmOperator *op = man->data.op;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list