diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-02-26 13:41:59 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-02-26 13:41:59 +0300 |
| commit | abecdac41e76ca40919d5b538fb5179686fd72d1 (patch) | |
| tree | 41c214914160208876bc437486ad77cbd20d4235 /source/blender | |
| parent | 7a55884b627e62951c62630fae10eeab569fe3af (diff) | |
Bugfix: In Action Editor, when "show pose markers" was enabled, all
markers were always drawn as local pose-markers, even when they were
not.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_action/space_action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index b08ddfbcba9..3e25df634e5 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -193,7 +193,7 @@ static void action_main_area_draw(const bContext *C, ARegion *ar) /* markers */ UI_view2d_view_orthoSpecial(ar, v2d, 1); - flag = (saction->flag & SACTION_POSEMARKERS_SHOW)? DRAW_MARKERS_LOCAL : 0; + flag = (ac.markers && (ac.markers != &ac.scene->markers))? DRAW_MARKERS_LOCAL : 0; draw_markers_time(C, flag); /* preview range */ |