diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_time.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 2a3bcfc01ba..c4c4097315c 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -256,7 +256,7 @@ def marker_menu_generic(layout): layout.separator() ts = bpy.context.tool_settings - layout.prop(ts, "marker_lock") + layout.prop(ts, "lock_markers") if __name__ == "__main__": # only for live edit. 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; } diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index e03d77d4ec5..ca2edb5eb90 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1272,7 +1272,7 @@ typedef struct ToolSettings { char proportional_mask; /* proportional edit, mask editing */ char proportional_action; /* proportional edit, action editor */ char proportional_fcurve; /* proportional edit, graph editor */ - char marker_lock; /* lock marker editing */ + char lock_markers; /* lock marker editing */ char pad4[5]; char auto_normalize; /*auto normalizing mode in wpaint*/ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index a17a746945c..a47a777ee7c 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2180,8 +2180,8 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ - prop = RNA_def_property(srna, "marker_lock", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "marker_lock", 0); + prop = RNA_def_property(srna, "lock_markers", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "lock_markers", 0); RNA_def_property_ui_text(prop, "Lock Markers", "Prevent marker editing"); prop = RNA_def_property(srna, "proportional_edit_falloff", PROP_ENUM, PROP_NONE); |