RNA: use lock_ prefix for booleans
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Apr 2015 04:51:17 +0000 (14:51 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Apr 2015 04:51:17 +0000 (14:51 +1000)
release/scripts/startup/bl_ui/space_time.py
source/blender/editors/animation/anim_markers.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c

index 2a3bcfc01ba32189aa2744df62b6eb6927b3aaad..c4c4097315cbf1ba853e6759ef39d9c75eaad00e 100644 (file)
@@ -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.
index ac6a0aede17d9993c479f2393d14194b528172c2..aa06740ed0efe3515c6e45a6d1afbdaf12f6c03f 100644 (file)
@@ -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;
        }
index e03d77d4ec5471797be7d594a2f35b9f90194776..ca2edb5eb9044a082e6203942760e938d816cd60 100644 (file)
@@ -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*/
index a17a746945c7f57a2f7724e6610dffbec18a5628..a47a777ee7c4fb5c1f950c2b0f5460db0c225924 100644 (file)
@@ -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);