blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 749 Projects 19 Wiki Activity

Fix manipulator crash when modal operator doesn't run

This commit is contained in:
Campbell Barton 2018-01-05 14:53:10 +11:00
parent a9e3ac906e
commit 9be32ac5fe
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -893,17 +893,13 @@ void wm_manipulatormap_modal_set(
WM_manipulatormap_tooltip_clear(C, mmap);
/* For now only grab cursor for 3D manipulators. */
int retval = OPERATOR_RUNNING_MODAL;
if (mpr->type->invoke &&
(mpr->type->modal || mpr->custom_modal))
{
retval = mpr->type->invoke(C, mpr, event);
}
if ((retval & OPERATOR_RUNNING_MODAL) == 0) {
return;
const int retval = mpr->type->invoke(C, mpr, event);
if ((retval & OPERATOR_RUNNING_MODAL) == 0) {
return;
}
}
mpr->state |= WM_MANIPULATOR_STATE_MODAL;
@ -922,7 +918,10 @@ void wm_manipulatormap_modal_set(
struct wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, mpr->highlight_part);
if (mpop && mpop->type) {
WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr);
const int retval = WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr);
if ((retval & OPERATOR_RUNNING_MODAL) == 0) {
wm_manipulatormap_modal_set(mmap, C, mpr, event, false);
}
/* we failed to hook the manipulator to the operator handler or operator was cancelled, return */
if (!mmap->mmap_context.modal) {