diff options
| author | Alessio Monti di Sopra <a.monti> | 2019-11-30 09:03:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-30 09:08:04 +0300 |
| commit | dc87d09b8b3249898e0f0d301fa22f03cff9d6d5 (patch) | |
| tree | 44b22d9d1046dc30c7ae340eb544712630b7cd6b /source/blender/editors/space_action | |
| parent | f478fef9d6b0609f4bb60fd98e9292b60927b80e (diff) | |
UI: allow to hide markers region per editor
Instead of having the option to show marker lines,
make the marker region optional.
- Added a Show Markers entry in the View menu of the animation editors.
- If the markers region is not active then the Marker menu gets hidden.
- Removed marker menu from the driver editor
and don't allow to use marker operators.
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/space_action.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 1685852dd02..901efbdf0ff 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -71,7 +71,7 @@ static SpaceLink *action_new(const ScrArea *sa, const Scene *scene) saction->autosnap = SACTSNAP_FRAME; saction->mode = SACTCONT_DOPESHEET; saction->mode_prev = SACTCONT_DOPESHEET; - saction->flag = SACTION_SHOW_INTERPOLATION | SACTION_SHOW_MARKER_LINES; + saction->flag = SACTION_SHOW_INTERPOLATION | SACTION_SHOW_MARKERS; saction->ads.filterflag |= ADS_FILTER_SUMMARY; @@ -215,10 +215,10 @@ static void action_main_region_draw(const bContext *C, ARegion *ar) marker_flag = ((ac.markers && (ac.markers != &ac.scene->markers)) ? DRAW_MARKERS_LOCAL : 0) | DRAW_MARKERS_MARGIN; - if (saction->flag & SACTION_SHOW_MARKER_LINES) { - marker_flag |= DRAW_MARKERS_LINES; + + if (saction->flag & SACTION_SHOW_MARKERS) { + ED_markers_draw(C, marker_flag); } - ED_markers_draw(C, marker_flag); /* caches */ if (saction->mode == SACTCONT_TIMELINE) { |