diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-24 10:04:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-24 10:04:28 +0300 |
| commit | e20c825b05e00954995fe2ed74e7fb409d09abe8 (patch) | |
| tree | 4491775682a618cb6e2e902bfe4ec61d72966d7b /source/blender/editors/transform/transform_manipulator.c | |
| parent | 134e927965c9871df8a9e13806f1cd48f4d43f16 (diff) | |
Manipulator: modal callback can now cancel & pass events
Re-use operator return flags for manipulator modal & invoke,
this means manipulators can allow navigation or other events to be
handled as they run - see T52499
Diffstat (limited to 'source/blender/editors/transform/transform_manipulator.c')
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 8825d1e55bc..84892ee7641 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1139,7 +1139,7 @@ static ManipulatorGroup *manipulatorgroup_init(wmManipulatorGroup *mgroup) /** * Custom handler for manipulator widgets */ -static void manipulator_modal( +static int manipulator_modal( bContext *C, wmManipulator *widget, const wmEvent *UNUSED(event), eWM_ManipulatorTweak UNUSED(tweak_flag)) { @@ -1154,6 +1154,8 @@ static void manipulator_modal( } ED_region_tag_redraw(ar); + + return OPERATOR_RUNNING_MODAL; } static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup) |