[Bf-blender-cvs] [3057a6d6cf5] greasepencil-object: Fix after merge errors

[Antonio Vazquez]

Commit: 3057a6d6cf573053b3c32a1446c68092a83e221e
Author: Antonio Vazquez
Date:   Wed Oct 18 10:47:36 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3057a6d6cf573053b3c32a1446c68092a83e221e

Fix after merge errors

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

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

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

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 3c817b3281a..29b46eec20b 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -89,7 +89,7 @@ const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
+const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
 	{ GP_EMPTY, "EMPTY", ICON_OUTLINER_OB_GPENCIL, "Empty", "" },
 	{ GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "" },
 	{ 0, NULL, 0, NULL, NULL }
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index fee826eace6..382a0b905d9 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -445,7 +445,7 @@ EnumPropertyItem rna_enum_gpencil_drawing_brushes_items[] = {
 };
 
 
-EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
+const EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 	{COLLECTION_MODE_OBJECT, "OBJECT", 0, "Object", ""},
 	{COLLECTION_MODE_EDIT, "EDIT", 0, "Edit", ""},
 	{COLLECTION_MODE_PAINT_WEIGHT, "PAINT_WEIGHT", 0, "Weight Paint", ""},