diff options
author | Ton Roosendaal <ton@blender.org> | 2006-11-17 14:56:00 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-11-17 14:56:00 +0300 |
commit | 4923b8e7a2b4d5528efdefd4414c28dc55d3bc38 (patch) | |
tree | 6eb293b9c4cab1b297525633d287706c77b33236 /source/blender/src/header_action.c | |
parent | 1ad9d9f370557f92e5e0b9a10912b68ecb15504c (diff) |
Fixes for Time Marker support in Action window;
- now draws on correct height
- selection is clipped correctly (did entire height)
- made showing scene markers default
Actually this implementation should have been a patch review... it was
done with entirely duplicating the code from timeline.c, whilst re-use
and generalizing markers has a preference. That way markers can become
supported in any time-based editor.
Will send an extensive review to Joshua Leung :)
Diffstat (limited to 'source/blender/src/header_action.c')
-rw-r--r-- | source/blender/src/header_action.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 27893184c24..1f84a1176e5 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -1095,29 +1095,7 @@ void action_buttons(void) from, &(G.saction->actnr), B_ACTALONE, B_ACTLOCAL, B_ACTIONDELETE, 0, 0); - - /* Draw marker set selection box */ - xco+= 8; - - if (G.saction->action != NULL) { - uiDefButS(block, MENU, B_REDR, - "Markers%t|None%x0|Scene%x1|Action%x2", - xco, 0, 80, 20, &(G.saction->markert), 0, 0, 0, 0, - "What set of markers to display."); - } - else { - if (G.saction->markert == SACTION_ACMARKERS) - G.saction->markert = SACTION_NOMARKERS; - uiDefButS(block, MENU, B_REDR, - "Markers%t|None%x0|Scene%x1", - xco, 0, 80, 20, &(G.saction->markert), 0, 0, 0, 0, - "What set of markers to display."); - } - - xco+=80; - - /* Draw action baker */ xco+= 8; |