From abecdac41e76ca40919d5b538fb5179686fd72d1 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 26 Feb 2011 10:41:59 +0000 Subject: Bugfix: In Action Editor, when "show pose markers" was enabled, all markers were always drawn as local pose-markers, even when they were not. --- source/blender/editors/space_action/space_action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender') 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 */ -- cgit v1.2.3