diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-27 01:51:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-27 01:51:47 +0300 |
| commit | c5c987cde9da3f19280856f53a82024d0646ee50 (patch) | |
| tree | e152c838455c6c8fc8c3a30f2e0138ece0b3b60e | |
| parent | 5732d9e1dcc08d284d7f9f56be22ad901fd53f22 (diff) | |
Cleanup: flip option unlock -> lock
Nearly all options are currently to toggle locking.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_gpencil.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_gpencil.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index d502df6c0d3..0f57ff07914 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -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): diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 48e1261f815..ac7a6da6c18 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -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); |