[Bf-blender-cvs] [ac747c96d99] blender2.8: GP: Move Unlock Color to Adjustments panel
Antonioya
noreply at git.blender.org
Mon Sep 24 22:26:54 CEST 2018
Commit: ac747c96d99ff51b1730470957bd273a2329a9c3
Author: Antonioya
Date: Mon Sep 24 22:26:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBac747c96d99ff51b1730470957bd273a2329a9c3
GP: Move Unlock Color to Adjustments panel
This option is not used all the time and can be moved to additional panel
===================================================================
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.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 6c9caca4a7a..12af20c4a93 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -188,6 +188,9 @@ class DATA_PT_gpencil_layer_optionpanel(LayerDataButtonsPanel, Panel):
col = layout.row(align=True)
col.prop(gpl, "line_change", text="Stroke Thickness")
+ col = layout.row(align=True)
+ col.prop(gpl, "unlock_color", text="Unlock Color")
+
class DATA_PT_gpencil_parentpanel(LayerDataButtonsPanel, Panel):
bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 0165ec1a340..dc0999ed5a1 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -866,7 +866,6 @@ class GPENCIL_UL_layer(UIList):
row = layout.row(align=True)
row.prop(gpl, "lock", text="", emboss=False)
row.prop(gpl, "hide", text="", emboss=False)
- row.prop(gpl, "unlock_color", text="", emboss=False)
subrow = row.row(align=True)
subrow.prop(
gpl,
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index de8404d3e03..6fd44655bff 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1100,7 +1100,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
/* Unlock colors */
prop = RNA_def_property(srna, "unlock_color", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_UNLOCK_COLOR);
- RNA_def_property_ui_icon(prop, ICON_RESTRICT_COLOR_OFF, 1);
+ 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_update(prop, NC_GPENCIL | ND_DATA, NULL);
More information about the Bf-blender-cvs
mailing list