Fix T45148, stupid own mistake, the two functions are not the same,
authorAntony Riakiotakis <kalast@gmail.com>
Mon, 22 Jun 2015 17:38:30 +0000 (19:38 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Mon, 22 Jun 2015 17:40:07 +0000 (19:40 +0200)
shouldn't have collapsed them

source/blender/editors/animation/anim_markers.c

index 67839d117224bc55a2c002bb9867f81a37cff68a..328cec9b1a63b3cdd5a0b2d359e9c5a66a8e8520 100644 (file)
@@ -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;