diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-01-10 02:16:05 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-01-10 02:16:05 +0300 |
| commit | 56db5f10aab70fe9f99c830efbafd77b5f8b6c49 (patch) | |
| tree | 98988cf3dacd332bb998d526ac1473dde573f776 /source/blender/editors/space_action/space_action.c | |
| parent | 3fba5cfe7ae1b3e626a88b63ed2295e1a6ce13b0 (diff) | |
Restoring "Pose Markers"
These were markers which belonged to an action instead of the scene,
and are used by PoseLib to keep track of where poses are.
To restore this, I've made this only available in Action/Shapekey
Editor modes, and only when an action is being shown and the "Show
Pose Markers" option in the Markers menu has been enabled. Other than
that, all the standard marker operators apply now (instead of using a
separate set of special operators).
Diffstat (limited to 'source/blender/editors/space_action/space_action.c')
| -rw-r--r-- | source/blender/editors/space_action/space_action.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 031743953ec..faeb7a68968 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -191,7 +191,9 @@ static void action_main_area_draw(const bContext *C, ARegion *ar) /* markers */ UI_view2d_view_orthoSpecial(ar, v2d, 1); - draw_markers_time(C, 0); + + flag = (saction->flag & SACTION_POSEMARKERS_SHOW)? DRAW_MARKERS_LOCAL : 0; + draw_markers_time(C, flag); /* preview range */ UI_view2d_view_ortho(v2d); |