diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-27 17:48:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-27 17:56:08 +0300 |
| commit | ddff9d0ea68b4c92be2fc515a4ec6a17b3696aa0 (patch) | |
| tree | 0bf133537dac8f69339905ee364db47fa992a3e1 /source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c | |
| parent | ca9801bd427ce2e76a992b62d476859efcc14547 (diff) | |
Manipulator: support operator per-part
A single manipulator could only assign a single operator to each part.
Now each part can have it's own.
Also modify 2D selection callback, 2D started at 1, 3D at 0.
Now use -1 for unset value, start both at 0.
Diffstat (limited to 'source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c index 50e1d82a0fc..9ef3590de96 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c @@ -87,7 +87,7 @@ void WM_manipulator_target_property_def_rna_ptr( wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_at_index(mpr, mpr_prop_type->index_in_type); /* if manipulator evokes an operator we cannot use it for property manipulation */ - mpr->op_data.type = NULL; + BLI_assert(mpr->op_data == NULL); mpr_prop->type = mpr_prop_type; @@ -116,7 +116,7 @@ void WM_manipulator_target_property_def_func_ptr( wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_at_index(mpr, mpr_prop_type->index_in_type); /* if manipulator evokes an operator we cannot use it for property manipulation */ - mpr->op_data.type = NULL; + BLI_assert(mpr->op_data == NULL); mpr_prop->type = mpr_prop_type; |