[Bf-blender-cvs] [1cdf136846c] blender2.8: GP: Rename parameter unlock_color and tooltip

[Antonioya]

Commit: 1cdf136846c9a5aa804eb757164ce78ffc90626a
Author: Antonioya
Date:   Wed Sep 26 16:17:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1cdf136846c9a5aa804eb757164ce78ffc90626a

GP: Rename parameter unlock_color and tooltip

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 3b85a4cebc4..d502df6c0d3 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_color", text="Unlock Color")
+        col.prop(gpl, "unlock_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 6fd44655bff..48e1261f815 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1098,11 +1098,11 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	/* Unlock colors */
-	prop = RNA_def_property(srna, "unlock_color", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "unlock_material", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_UNLOCK_COLOR);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Unlock Color",
-	                         "Unprotect selected colors from further editing and/or frame changes");
+	RNA_def_property_ui_text(prop, "Override Locked Materials",
+	                         "Allow Locked Materials edition");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);