Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-02-26 19:24:36 +0300
committerJacques Lucke <mail@jlucke.com>2019-02-26 19:24:36 +0300
commitd54143078562fbf7780f0da8ab5c6da79a9c21b1 (patch)
tree58c6d033aa82c8d64c173dd827283f6928325969 /source/blender/editors/space_action
parent2b3553eff2a01cf3d1655183de9ebd416abde9c1 (diff)
UI: Show marker lines in remaining animation spaces
This also includes fixed/slighly refactored drawing code for marker lines. The old code used the wrong height. Reviewers: brecht Differential Revision: https://developer.blender.org/D4411
Diffstat (limited to 'source/blender/editors/space_action')
-rw-r--r--source/blender/editors/space_action/space_action.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index ac82fb2888a..3dffa6afb55 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -243,6 +243,7 @@ static void action_main_region_draw(const bContext *C, ARegion *ar)
UI_view2d_view_orthoSpecial(ar, v2d, 1);
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;
ED_markers_draw(C, marker_flag);
/* caches */