reverting part of rev40594.
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 1 Oct 2011 13:46:20 +0000 (13:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 1 Oct 2011 13:46:20 +0000 (13:46 +0000)
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
source/blender/windowmanager/intern/wm_event_system.c

index d3d7b1b15059f4f7e3fb0112737fe8791a838615..0854f9f36852e84e7a3542fea5819c7b59fd9cad 100644 (file)
@@ -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)
index 596fa35d5973ca496fc8363163cfa643176d5028..cafee6b49caf521e50b471368894b7c360957d54 100644 (file)
@@ -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);