Added RNA functions from PyRNA

* RNA_property_enum_value
* RNA_property_enum_identifier
To get an enum string from a value and a value from an enum.

BPy_StructRNA types (objects, meshes, images etc) can now be used as dictionary keys.

2 files changed, 38 insertions, 0 deletions

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 3b685792d33..8c296dce5f2 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -174,6 +174,9 @@ void RNA_property_float_ui_range(PointerRNA *ptr, PropertyRNA *prop, float *soft
 int RNA_property_string_maxlength(PointerRNA *ptr, PropertyRNA *prop);
 
 void RNA_property_enum_items(PointerRNA *ptr, PropertyRNA *prop, const EnumPropertyItem **item, int *totitem);
+int RNA_property_enum_value(PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value);
+int RNA_property_enum_identifier(PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier);
+
 
 const char *RNA_property_ui_name(PointerRNA *ptr, PropertyRNA *prop);
 const char *RNA_property_ui_description(PointerRNA *ptr, PropertyRNA *prop);
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 9f07d2a3311..2c9cb9f4dfa 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -401,6 +401,40 @@ void RNA_property_enum_items(PointerRNA *ptr, PropertyRNA *prop, const EnumPrope
 	*totitem= eprop->totitem;
 }
 
+int RNA_property_enum_value(PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value)
+{	
+	const EnumPropertyItem *item;
+	int totitem, i;
+	
+	RNA_property_enum_items(ptr, prop, &item, &totitem);
+	
+	for (i=0; i<totitem; i++) {
+		if (strcmp(item[i].identifier, identifier)==0) {
+			*value = item[i].value;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+int RNA_property_enum_identifier(PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier)
+{	
+	const EnumPropertyItem *item;
+	int totitem, i;
+	
+	RNA_property_enum_items(ptr, prop, &item, &totitem);
+	
+	for (i=0; i<totitem; i++) {
+		if (item[i].value==value) {
+			*identifier = item[i].identifier;
+			return 1;
+		}
+	}
+	
+	return 0;
+}
+
 const char *RNA_property_ui_name(PointerRNA *ptr, PropertyRNA *prop)
 {
 	PropertyRNA *oldprop= prop;
@@ -764,6 +798,7 @@ int RNA_property_enum_get(PointerRNA *ptr, PropertyRNA *prop)
 		return eprop->defaultvalue;
 }
 
+
 void RNA_property_enum_set(PointerRNA *ptr, PropertyRNA *prop, int value)
 {
 	EnumPropertyRNA *eprop= (EnumPropertyRNA*)prop;