From 5e509a3aa9d1f14d3293da3b0cc72fb633d7773a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 18 Sep 2020 15:16:30 +0200 Subject: RNA access: Add utils to search a collection item from its name, and get both item pointer and its index in the collection. --- source/blender/makesrna/intern/rna_access.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'source/blender/makesrna/intern/rna_access.c') diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 793552c5c34..45508aec67a 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -4216,10 +4216,8 @@ int RNA_property_collection_lookup_int(PointerRNA *ptr, } } -int RNA_property_collection_lookup_string(PointerRNA *ptr, - PropertyRNA *prop, - const char *key, - PointerRNA *r_ptr) +int RNA_property_collection_lookup_string_index( + PointerRNA *ptr, PropertyRNA *prop, const char *key, PointerRNA *r_ptr, int *r_index) { CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)rna_ensure_property(prop); @@ -4237,9 +4235,10 @@ int RNA_property_collection_lookup_string(PointerRNA *ptr, int found = 0; int keylen = strlen(key); int namelen; + int index = 0; RNA_property_collection_begin(ptr, prop, &iter); - for (; iter.valid; RNA_property_collection_next(&iter)) { + for (; iter.valid; RNA_property_collection_next(&iter), index++) { if (iter.ptr.data && iter.ptr.type->nameproperty) { nameprop = iter.ptr.type->nameproperty; @@ -4263,12 +4262,25 @@ int RNA_property_collection_lookup_string(PointerRNA *ptr, if (!iter.valid) { memset(r_ptr, 0, sizeof(*r_ptr)); + *r_index = -1; + } + else { + *r_index = index; } return iter.valid; } } +int RNA_property_collection_lookup_string(PointerRNA *ptr, + PropertyRNA *prop, + const char *key, + PointerRNA *r_ptr) +{ + int index; + return RNA_property_collection_lookup_string_index(ptr, prop, key, r_ptr, &index); +} + /* zero return is an assignment error */ int RNA_property_collection_assign_int(PointerRNA *ptr, PropertyRNA *prop, -- cgit v1.2.3