[Bf-blender-cvs] [e3c802a4041] greasepencil-object: Rename empty Grease Pencil object from "GP Object" to "Blank"

[Pablo Vazquez]

Commit: e3c802a404163562e043af63211967c542ef635a
Author: Pablo Vazquez
Date:   Fri Jan 26 16:00:45 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe3c802a404163562e043af63211967c542ef635a

Rename empty Grease Pencil object from "GP Object" to "Blank"

Also, name the Monkey palette "Suzanne" (same as we do for mesh datablock/object name)

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

M	source/blender/editors/gpencil/gpencil_add_monkey.c
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 2ba22d0a12a..6f32ea50970 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -1354,7 +1354,7 @@ void ED_gpencil_create_monkey(bContext *C, bGPdata *gpd)
 	bGPDstroke *gps;
 	
 	/* create palette and colors */
-	bGPDpaletteref *palslot = BKE_gpencil_paletteslot_addnew(bmain, gpd, "Monkey");
+	bGPDpaletteref *palslot = BKE_gpencil_paletteslot_addnew(bmain, gpd, "Suzanne");
 	Palette *palette = palslot->palette;
 
 	PaletteColor *color_Black = BKE_palette_color_add_name(palette, "Black");
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index cda51e45ad1..db04f90c2d1 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -90,8 +90,8 @@ const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = {
 };
 
 const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
-	{ GP_EMPTY, "EMPTY", ICON_OUTLINER_OB_GREASEPENCIL, "GP Object", "" },
-	{ GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "" },
+	{ GP_EMPTY, "EMPTY", ICON_OUTLINER_OB_GREASEPENCIL, "Blank", "Create an empty grease pencil object" },
+	{ GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "Construct a Suzanne grease pencil object" },
 	{ 0, NULL, 0, NULL, NULL }
 };