[Bf-blender-cvs] [72b2de3] wiggly-widgets: Cleanup: Use of old OGL extensions, use `rna_enum_` prefix for RNA enums

[Julian Eisel]

Commit: 72b2de3fa6ac3175f1eba0fb9ee370f2a1353faa
Author: Julian Eisel
Date:   Tue Nov 24 08:51:46 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB72b2de3fa6ac3175f1eba0fb9ee370f2a1353faa

Cleanup: Use of old OGL extensions, use `rna_enum_` prefix for RNA enums

Just to apply to latest changes in master.

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

M	source/blender/editors/object/object_edit.c
M	source/blender/makesrna/RNA_enum_types.h
M	source/blender/makesrna/intern/rna_wm.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 377e585..db3bca7 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2133,7 +2133,7 @@ void OBJECT_OT_widget_add(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	prop = RNA_def_enum(ot->srna, "type", wm_widget_type_items, 0, "Type", "Select the type of widget to add");
+	prop = RNA_def_enum(ot->srna, "type", rna_enum_wm_widget_type_items, 0, "Type", "Select the type of widget to add");
 	ot->prop = prop;
 }
 
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 55441db..6954a6d 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -140,7 +140,7 @@ extern EnumPropertyItem rna_enum_keymap_propvalue_items[];
 extern EnumPropertyItem rna_enum_operator_context_items[];
 
 extern EnumPropertyItem rna_enum_wm_report_items[];
-extern EnumPropertyItem wm_widget_type_items[];
+extern EnumPropertyItem rna_enum_wm_widget_type_items[];
 
 extern EnumPropertyItem rna_enum_transform_mode_types[];
 
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 7083612..fadf06f 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -448,7 +448,7 @@ EnumPropertyItem rna_enum_wm_report_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem wm_widget_type_items[] = {
+EnumPropertyItem rna_enum_wm_widget_type_items[] = {
 	{WT_TRANSLATE, "TRANSLATE", ICON_MAN_TRANS, "Translate", "Add a widget for moving objects"},
 	{WT_ROTATE,    "ROTATE",    ICON_MAN_ROT,   "Rotate",    "Add a widget for rotating objects"},
 	{WT_SCALE,     "SCALE",     ICON_MAN_SCALE, "Scale",     "Add a widget for scaling objects"},