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/editors/transform/transform_manipulator.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/editors/transform/transform_manipulator.c')
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 84892ee7641..9a4be46855f 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1232,7 +1232,7 @@ static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulat if (ot_store.translate == NULL) { ot_store.translate = WM_operatortype_find("TRANSFORM_OT_translate", true); } - ptr = WM_manipulator_set_operator(axis, ot_store.translate, NULL); + ptr = WM_manipulator_operator_set(axis, 0, ot_store.translate, NULL); break; case MAN_AXES_ROTATE: { @@ -1249,7 +1249,7 @@ static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulat } ot_rotate = ot_store.rotate; } - ptr = WM_manipulator_set_operator(axis, ot_rotate, NULL); + ptr = WM_manipulator_operator_set(axis, 0, ot_rotate, NULL); break; } case MAN_AXES_SCALE: @@ -1257,7 +1257,7 @@ static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulat if (ot_store.resize == NULL) { ot_store.resize = WM_operatortype_find("TRANSFORM_OT_resize", true); } - ptr = WM_manipulator_set_operator(axis, ot_store.resize, NULL); + ptr = WM_manipulator_operator_set(axis, 0, ot_store.resize, NULL); break; } } |