Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-10-01 17:46:20 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-10-01 17:46:20 +0400
commitca5871c26fa11dd856aae1731877902bc4169cbf (patch)
tree06a41f22543a2ce93ee3d6682c91275e044b358f /source/blender/windowmanager
parentfdcfb9a4a017224c9d9b8c66d6cd1efff55b00ab (diff)
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.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c4
1 files changed, 4 insertions, 0 deletions
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);