diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:06:21 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:06:21 +0400 |
| commit | 8ff0c2e10720bd6e583a6b133b75e7bdff27a5f8 (patch) | |
| tree | 9c7e15d27d1b53af6ee9f428c9db7d855f013807 /source/blender/editors/space_action | |
| parent | 7272bb643c379986c7332a994ce9e576d3b8a748 (diff) | |
| parent | 23e2bfed239256994a6daf2ca5a08298e7029681 (diff) | |
Merge with trunk r37475.
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_action/space_action.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index be8547afa23..4d0043913ab 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -332,6 +332,7 @@ void ACTION_OT_select_border(wmOperatorType *ot) ot->invoke= WM_border_select_invoke; ot->exec= actkeys_borderselect_exec; ot->modal= WM_border_select_modal; + ot->cancel= WM_border_select_cancel; ot->poll= ED_operator_action_active; diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 10a1fe62cca..7a824e6bf9d 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -58,6 +58,7 @@ #include "UI_view2d.h" #include "ED_space_api.h" +#include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" |