[Bf-blender-cvs] [6f6746f] GPencil_Editing_Stage3: Fix compile errors due to recent cleanups in master

[Joshua Leung]

Commit: 6f6746fb0124211d63945d34b352cb83f04d8ef3
Author: Joshua Leung
Date:   Mon Nov 23 23:46:42 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB6f6746fb0124211d63945d34b352cb83f04d8ef3

Fix compile errors due to recent cleanups in master

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

M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/object/object_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index a9a53e3..1f0a29b 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -954,7 +954,7 @@ static void gpsculpt_brush_header_set(bContext *C, tGP_BrushEditData *gso)
 	const char *brush_name = NULL;
 	char str[256] = "";
 	
-	RNA_enum_name(gpencil_sculpt_brush_items, gso->brush_type, &brush_name);
+	RNA_enum_name(rna_enum_gpencil_sculpt_brush_items, gso->brush_type, &brush_name);
 	
 	BLI_snprintf(str, sizeof(str),
 	             IFACE_("GPencil Sculpt: %s Stroke  | LMB to paint | RMB/Escape to Exit"
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index b11ed3c..64a6954 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1544,7 +1544,7 @@ static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *UNUSED(
 	 */
 	gpd = CTX_data_gpencil_data(C);
 	if (gpd) {
-		RNA_enum_items_add_value(&item, &totitem, object_mode_items, OB_MODE_GPENCIL);
+		RNA_enum_items_add_value(&item, &totitem, rna_enum_object_mode_items, OB_MODE_GPENCIL);
 	}
 
 	RNA_enum_item_end(&item, &totitem);