[Bf-blender-cvs] [b216f7a] master: RNA: use lock_ prefix for booleans

[Campbell Barton]

Commit: b216f7abd6ba4311918ee84bf051fac3d96faf5f
Author: Campbell Barton
Date:   Wed Apr 15 14:51:17 2015 +1000
Branches: master
https://developer.blender.org/rBb216f7abd6ba4311918ee84bf051fac3d96faf5f

RNA: use lock_ prefix for booleans

===================================================================

M       release/scripts/startup/bl_ui/space_time.py
M       source/blender/editors/animation/anim_markers.c
M       source/blender/makesdna/DNA_scene_types.h
M       source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_time.py 
b/release/scripts/startup/bl_ui/space_time.py
index 2a3bcfc..c4c4097 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 ac6a0ae..aa06740 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 e03d77d..ca2edb5 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 a17a746..a47a777 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs