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_logic | |
| parent | 7272bb643c379986c7332a994ce9e576d3b8a748 (diff) | |
| parent | 23e2bfed239256994a6daf2ca5a08298e7029681 (diff) | |
Merge with trunk r37475.
Diffstat (limited to 'source/blender/editors/space_logic')
| -rw-r--r-- | source/blender/editors/space_logic/logic_buttons.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index e894fd9cff5..16e916928a9 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -206,6 +206,7 @@ void LOGIC_OT_links_cut(wmOperatorType *ot) ot->invoke= WM_gesture_lines_invoke; ot->modal= WM_gesture_lines_modal; ot->exec= cut_links_exec; + ot->cancel= WM_gesture_lines_cancel; ot->poll= ED_operator_logic_active; diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 0cbc67a3504..a45e7d39c76 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3785,6 +3785,8 @@ static void draw_actuator_camera(uiLayout *layout, PointerRNA *ptr) row = uiLayoutRow(layout, 1); uiItemR(row, ptr, "min", 0, NULL, ICON_NONE); uiItemR(row, ptr, "max", 0, NULL, ICON_NONE); + + uiItemR(layout, ptr, "damping", 0, NULL, ICON_NONE); } static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr, bContext *C) |