[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35194] trunk/blender/source/blender/ editors/space_action/space_action.c: Bugfix: In Action Editor, when " show pose markers" was enabled, all

[Joshua Leung]

Revision: 35194
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35194
Author:   aligorith
Date:     2011-02-26 10:41:59 +0000 (Sat, 26 Feb 2011)
Log Message:
-----------
Bugfix: In Action Editor, when "show pose markers" was enabled, all
markers were always drawn as local pose-markers, even when they were
not.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_action/space_action.c

Modified: trunk/blender/source/blender/editors/space_action/space_action.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/space_action.c	2011-02-26 06:28:24 UTC (rev 35193)
+++ trunk/blender/source/blender/editors/space_action/space_action.c	2011-02-26 10:41:59 UTC (rev 35194)
@@ -193,7 +193,7 @@
 	/* 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 */