diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-15 18:41:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-15 18:41:57 +0300 |
| commit | 551a1b7c280e37ae599d07d1f37db49d66c7def6 (patch) | |
| tree | fce5cde187d689d539fd6a228990aa5a664ec3f6 /source/blender/editors/animation | |
| parent | 650915595c424e570879ac43eb6b74678e389c28 (diff) | |
| parent | a1c1b32e4e76403656a66ac8f6e538f134563304 (diff) | |
Merge branch 'cycles_memory_experiments' into gooseberry
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index ac6a0aede17..aa06740ed0e 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -504,7 +504,7 @@ static int ed_markers_poll_selected_no_locked_markers(bContext *C) ListBase *markers = ED_context_get_markers(C); ToolSettings *ts = CTX_data_tool_settings(C); - if (ts->marker_lock) + if (ts->lock_markers) return 0; /* first things first: markers can only exist in timeline views */ @@ -1457,7 +1457,7 @@ static int ed_marker_make_links_scene_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (scene_to->toolsettings->marker_lock) { + if (scene_to->toolsettings->lock_markers) { BKE_report(op->reports, RPT_ERROR, "Target scene has locked markers"); return OPERATOR_CANCELLED; } |