griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: flip option unlock -> lock

Browse Source 
Nearly all options are currently to toggle locking.
This commit is contained in:
Campbell Barton
2018-09-27 08:51:26 +10:00
parent 5732d9e1dc
commit c5c987cde9
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_gpencil.py
View File

@@ -189,7 +189,7 @@ class DATA_PT_gpencil_layer_optionpanel(LayerDataButtonsPanel, Panel):
col.prop(gpl, "line_change", text="Stroke Thickness")
col = layout.row(align=True)
col.prop(gpl, "unlock_material")
col.prop(gpl, "lock_material")
class DATA_PT_gpencil_parentpanel(LayerDataButtonsPanel, Panel):

8
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -1097,12 +1097,10 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Frame Locked", "Lock current frame displayed by layer");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* Unlock colors */
prop = RNA_def_property(srna, "unlock_material", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_UNLOCK_COLOR);
prop = RNA_def_property(srna, "lock_material", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_LAYER_UNLOCK_COLOR);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Override Locked Materials",
"Allow Locked Materials edition");
RNA_def_property_ui_text(prop, "Lock Material", "Disable Material editing");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);