diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-22 20:38:30 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-22 20:40:07 +0300 |
| commit | a1609791caeacbab0bb580000dae35145469826e (patch) | |
| tree | fcf1d37d1afe0a34e3a7f62d98aa56e649e53748 /source/blender/editors | |
| parent | 4faccf0a782a4f6978de35f694d9d21d1af83afc (diff) | |
Fix T45148, stupid own mistake, the two functions are not the same,
shouldn't have collapsed them
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |