blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Manipulator: disable cursor grabbing for 2D groups 

We could make this a manipulator type flag,
for now disable for all 2D manipulators since its annoying for cage2d.
This commit is contained in:
Campbell Barton 2017-08-09 23:37:11 +10:00
parent b4d44b98e8
commit 2f20b5242c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
View File

@ -835,6 +835,9 @@ void wm_manipulatormap_modal_set(
wmManipulatorMap *mmap, bContext *C, const wmEvent *event, wmManipulator *mpr)
{
if (mpr && C) {
/* For now only grab cursor for 3D manipulators. */
bool grab_cursor = (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) != 0;
mpr->state |= WM_MANIPULATOR_STATE_MODAL;
mmap->mmap_context.modal = mpr;
@ -862,7 +865,10 @@ void wm_manipulatormap_modal_set(
mpr->type->invoke(C, mpr, event);
}
}
WM_cursor_grab_enable(CTX_wm_window(C), true, true, NULL);
if (grab_cursor) {
WM_cursor_grab_enable(CTX_wm_window(C), true, true, NULL);
}
}
else {
mpr = mmap->mmap_context.modal;