[Bf-blender-cvs] [18576dff300] greasepencil-object: Various RNA fixes (noticed while adding palette slot support)

[Joshua Leung]

Commit: 18576dff300d6f8a16804f3aa34e319768d3efe3
Author: Joshua Leung
Date:   Fri Sep 29 02:46:37 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB18576dff300d6f8a16804f3aa34e319768d3efe3

Various RNA fixes (noticed while adding palette slot support)

* Added missing define for GP Object datatype in rna_Object_data_typef
* Improved a few descriptions/comments

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

M	source/blender/makesrna/intern/rna_gpencil.c
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index fc4c6c5789b..351d0f8e54c 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -820,7 +820,7 @@ static void rna_def_gpencil_triangle(BlenderRNA *brna)
 
 	srna = RNA_def_struct(brna, "GPencilTriangle", NULL);
 	RNA_def_struct_sdna(srna, "bGPDtriangle");
-	RNA_def_struct_ui_text(srna, "Triangle", "Triangulation data for HQ fill");
+	RNA_def_struct_ui_text(srna, "Triangle", "Triangulation data for Grease Pencil fills");
 
 	/* point v1 */
 	prop = RNA_def_property(srna, "v1", PROP_INT, PROP_NONE);
@@ -896,21 +896,21 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "palette", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "Palette");
 	RNA_def_property_pointer_sdna(prop, NULL, "palette");
-	RNA_def_property_ui_text(prop, "Palette", "Palette");
+	RNA_def_property_ui_text(prop, "Palette", "Palette that stroke's color comes from");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 
 	/* Color */
 	prop = RNA_def_property(srna, "color", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "PaletteColor");
 	RNA_def_property_pointer_sdna(prop, NULL, "palcolor");
-	RNA_def_property_ui_text(prop, "Palette Color", "Color from palette used in Stroke");
+	RNA_def_property_ui_text(prop, "Palette Color", "Color from palette used in stroke");
 	RNA_def_property_update(prop, 0, "rna_GPencil_update");
 
 	/* Settings */
 	prop = RNA_def_property(srna, "draw_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
 	RNA_def_property_enum_items(prop, stroke_draw_mode_items);
-	RNA_def_property_ui_text(prop, "Draw Mode", "");
+	RNA_def_property_ui_text(prop, "Draw Mode", "Coordinate space that stroke is in");
 	RNA_def_property_update(prop, 0, "rna_GPencil_update");
 	
 	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 8bee0e7ee46..c452a65471c 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -163,7 +163,7 @@ EnumPropertyItem rna_enum_object_type_items[] = {
 	{OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
 	{OB_LATTICE, "LATTICE", 0, "Lattice", ""},
 	{OB_EMPTY, "EMPTY", 0, "Empty", ""},
-	{ OB_GPENCIL, "GPENCIL", 0, "Gpencil", "" },
+	{OB_GPENCIL, "GPENCIL", 0, "GPencil", ""},
 	{0, "", 0, NULL, NULL},
 	{OB_CAMERA, "CAMERA", 0, "Camera", ""},
 	{OB_LAMP, "LAMP", 0, "Lamp", ""},
@@ -440,6 +440,7 @@ static StructRNA *rna_Object_data_typef(PointerRNA *ptr)
 		case OB_ARMATURE: return &RNA_Armature;
 		case OB_SPEAKER: return &RNA_Speaker;
 		case OB_LIGHTPROBE: return &RNA_LightProbe;
+		case OB_GPENCIL: return &RNA_GreasePencil;
 		default: return &RNA_ID;
 	}
 }
@@ -1071,7 +1072,6 @@ static char *rna_MaterialSlot_path(PointerRNA *ptr)
 	Object *ob = (Object *)ptr->id.data;
 	int index = (Material **)ptr->data - ob->mat;
 
-	/* from armature... */
 	return BLI_sprintfN("material_slots[%d]", index);
 }