[Bf-blender-cvs] [e166558ddda] greasepencil-object: Rename property for full color and fill

[Antonio Vazquez]

Commit: e166558ddda35c390f9f4032b1603dc8fc27b3db
Author: Antonio Vazquez
Date:   Sun Dec 10 09:20:37 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe166558ddda35c390f9f4032b1603dc8fc27b3db

Rename property for full color and fill

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	source/blender/makesrna/intern/rna_palette.c

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

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 4794dc36783..09e6d858d5d 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -993,8 +993,8 @@ class GPENCIL_UL_palettecolor(UIList):
             split = layout.split(percentage=0.25)
             row = split.row(align=True)
             row.enabled = not palcolor.lock
-            row.prop(palcolor, "color_full", text="", emboss=palcolor.is_stroke_visible)
-            row.prop(palcolor, "fill_full", text="", emboss=palcolor.is_fill_visible)
+            row.prop(palcolor, "color_rgba", text="", emboss=palcolor.is_stroke_visible)
+            row.prop(palcolor, "fill_rgba", text="", emboss=palcolor.is_fill_visible)
             split.prop(palcolor, "name", text="", emboss=False)
 
             row = layout.row(align=True)
diff --git a/source/blender/makesrna/intern/rna_palette.c b/source/blender/makesrna/intern/rna_palette.c
index 39afbb0b8b8..2c7a13a85bd 100644
--- a/source/blender/makesrna/intern/rna_palette.c
+++ b/source/blender/makesrna/intern/rna_palette.c
@@ -251,7 +251,7 @@ static void rna_def_palettecolor(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Color", "");
 	RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Palette_dependency_update");
 
-	prop = RNA_def_property(srna, "color_full", PROP_FLOAT, PROP_COLOR_GAMMA);
+	prop = RNA_def_property(srna, "color_rgba", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_float_sdna(prop, NULL, "rgb");
 	RNA_def_property_array(prop, 4);
@@ -292,7 +292,7 @@ static void rna_def_palettecolor(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Fill Color", "Color for filling region bounded by each stroke");
 	RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Palette_dependency_update");
 
-	prop = RNA_def_property(srna, "fill_full", PROP_FLOAT, PROP_COLOR_GAMMA);
+	prop = RNA_def_property(srna, "fill_rgba", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "fill");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_range(prop, 0.0f, 1.0f);