[Bf-blender-cvs] [a160979] master: Fix T45148, stupid own mistake, the two functions are not the same, shouldn't have collapsed them

[Antony Riakiotakis]

Commit: a1609791caeacbab0bb580000dae35145469826e
Author: Antony Riakiotakis
Date:   Mon Jun 22 19:38:30 2015 +0200
Branches: master
https://developer.blender.org/rBa1609791caeacbab0bb580000dae35145469826e

Fix T45148, stupid own mistake, the two functions are not the same,
shouldn't have collapsed them

===================================================================

M	source/blender/editors/animation/anim_markers.c

===================================================================

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 67839d1..328cec9 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -521,6 +521,9 @@ static int ed_markers_poll_markers_exist(bContext *C)
 {
 	ListBase *markers = ED_context_get_markers(C);
 	
+	if (ts->lock_markers)
+		return 0;
+
 	/* first things first: markers can only exist in timeline views */
 	if (ED_operator_animview_active(C) == 0)
 		return 0;