diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 69fc5b78834..da26b3dc297 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1225,7 +1225,7 @@ static int repeat_last_exec(bContext *C, wmOperator *op) wmOperator *lastop= C->wm->operators.last; if(lastop) { - printf("repeat %s\n", op->type->idname); + printf("repeat %s\n", lastop->type->idname); lastop->type->exec(C, lastop); } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 201a7452bbc..ac153b76c7e 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -505,6 +505,18 @@ static ScrArea *area_event_inside(bContext *C, wmEvent *event) return NULL; } +static ARegion *region_event_inside(bContext *C, wmEvent *event) +{ + ARegion *ar; + + if(C->screen && C->area) + for(ar= C->area->regionbase.first; ar; ar= ar->next) + if(BLI_in_rcti(&ar->winrct, event->x, event->y)) + return ar; + return NULL; +} + + /* called in main loop */ /* goes over entire hierarchy: events -> window -> screen -> area -> region */ void wm_event_do_handlers(bContext *C) @@ -523,6 +535,7 @@ void wm_event_do_handlers(bContext *C) C->window= win; C->screen= win->screen; C->area= area_event_inside(C, event); + C->region= region_event_inside(C, event); /* MVC demands to not draw in event handlers... for now we leave it */ wm_window_make_drawable(C, win); |