diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-02 10:41:10 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-02 10:41:10 +0400 |
| commit | 6b784a80f02deaca05e347dc2626dc92826f0944 (patch) | |
| tree | c479db7ceb1b8a317f3bed9b8a199bbea1236f18 /source/blender/editors/space_graph | |
| parent | f3c47a66b0cb3bb70505ed46522e6c557769eaa5 (diff) | |
NLA SoC: F-Modifiers working on NLA Strips
* Using the Ctrl-Shift-M hotkey, F-Modifiers can be added to all the selected strips.
* F-Modifiers can also be added/tweaked from the NLA N-Key properties. The UI now uses the same code as for the graph editor ones.
The UI drawing here is currently messed up from the NLA side, since it seems combining normal layout stuff and old-style uiBlocks doesn't seem to work too well (BUT! the buttons are at least functional).
Next up, I'll need to recode the buttons panel for the Graph Editor so that all of the drawing can be migrated over to use the new layout engine.
Diffstat (limited to 'source/blender/editors/space_graph')
| -rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_ops.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 9d4a1a8b3cb..5616ffc8002 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -381,7 +381,7 @@ static void graph_panel_modifiers(const bContext *C, Panel *pa) /* draw each modifier */ for (fcm= fcu->modifiers.first; fcm; fcm= fcm->next) - ANIM_uiTemplate_fmodifier_draw(block, fcu, fcm, &yco); + ANIM_uiTemplate_fmodifier_draw(block, &fcu->modifiers, fcm, &yco); MEM_freeN(ale); } diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index a82699ac1e5..9a50c5cc203 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1741,7 +1741,7 @@ void GRAPH_OT_smooth (wmOperatorType *ot) /* ************************************************************************** */ /* F-CURVE MODIFIERS */ -/* ******************** Add F-Curve Modifier Operator *********************** */ +/* ******************** Add F-Modifier Operator *********************** */ static int graph_fmodifier_add_exec(bContext *C, wmOperator *op) { diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index d5e93dafaf0..38bde61a46c 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -221,8 +221,7 @@ static void graphedit_keymap_keyframes (wmWindowManager *wm, ListBase *keymap) WM_keymap_add_item(keymap, "GRAPH_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_add_item(keymap, "GRAPH_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); - /* F-Curve Modifiers */ - // XXX these are temporary? operators... + /* F-Modifiers */ WM_keymap_add_item(keymap, "GRAPH_OT_fmodifier_add", MKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); |