RNA:

* Accept None as NULL pointers through python function calls.
* Added type callback for pointers back, it's useful still in
  some cases. Made Object.data editable using this, the pointer
  type varying based on object type.
* Wrap pin ID pointer in buttons space.
* Added subclasses for text and surface curve ID blocks, to
  organize data better and get proper icons.
* Added RNA_type_to_ID_code and ID_code_to_RNA_type functions.
* Update RNA_access.h with new RNA types.

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 740b889dccf..072bc5a6feb 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1457,9 +1457,9 @@ static void ui_rna_ID_collection(bContext *C, uiBut *but, PointerRNA *ptr, Prope
 
 		/* if it's a collection and has same pointer type, we've got it */
 		if(RNA_property_type(iprop) == PROP_COLLECTION) {
-			srna= RNA_property_pointer_type(iprop);
+			srna= RNA_property_pointer_type(ptr, iprop);
 
-			if(RNA_property_pointer_type(but->rnaprop) == srna) {
+			if(RNA_property_pointer_type(ptr, but->rnaprop) == srna) {
 				*prop= iprop;
 				break;
 			}
@@ -1530,7 +1530,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str)
 				if(str == NULL || str[0] == '\0') {
 					memset(&rptr, 0, sizeof(rptr));
 					RNA_property_pointer_set(&but->rnapoin, but->rnaprop, rptr);
-					return 11;
+					return 1;
 				}
 				else if(prop && RNA_property_collection_lookup_string(&ptr, prop, str, &rptr)) {
 					RNA_property_pointer_set(&but->rnapoin, but->rnaprop, rptr);