forked from bartvdbraak/blender
RNA: use lock_ prefix for booleans
This commit is contained in:
parent
9b9978656d
commit
b216f7abd6
@ -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.
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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*/
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user