From ca5871c26fa11dd856aae1731877902bc4169cbf Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 1 Oct 2011 13:46:20 +0000 Subject: [PATCH] reverting part of rev40594. Pardoon, looks like i've forgot to revert current work before commiting actual patch i wanted to send to the svn. --- source/blender/editors/space_view3d/view3d_edit.c | 2 +- source/blender/windowmanager/intern/wm_event_system.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index d3d7b1b1505..0854f9f3685 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3226,7 +3226,7 @@ static int set_3dcursor_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *eve else WM_event_add_notifier(C, NC_SCENE|NA_EDITED, scene); - return OPERATOR_PASS_THROUGH; + return OPERATOR_FINISHED; } void VIEW3D_OT_cursor3d(wmOperatorType *ot) diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 596fa35d597..cafee6b49ca 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1278,6 +1278,10 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand } /* Finished and pass through flag as handled */ + /* Finished and pass through flag as handled */ + if(retval == (OPERATOR_FINISHED|OPERATOR_PASS_THROUGH)) + return WM_HANDLER_HANDLED; + /* Modal unhandled, break */ if(retval == (OPERATOR_PASS_THROUGH|OPERATOR_RUNNING_MODAL)) return (WM_HANDLER_BREAK|WM_HANDLER_MODAL);