From a1609791caeacbab0bb580000dae35145469826e Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 22 Jun 2015 19:38:30 +0200 Subject: Fix T45148, stupid own mistake, the two functions are not the same, shouldn't have collapsed them --- source/blender/editors/animation/anim_markers.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 67839d11722..328cec9b1a6 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; -- cgit v1.2.3