From f9ccd26b037d43f2490d1f0263e45e775d30473d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Sep 2021 21:58:52 +1000 Subject: Fix T87768: `.path_resolve` fails when requested property is None. Add a version of RNA_path_resolve_full that returns true when the path resolves to a NULL RNA pointer. --- source/blender/makesrna/intern/rna_access.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (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 75df8f929e8..0ba5b786187 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5361,6 +5361,18 @@ bool RNA_path_resolve_full( return r_ptr->data != NULL; } +/** + * A version of #RNA_path_resolve_full doesn't check the value of #PointerRNA.data. + * + * \note While it's correct to ignore the value of #PointerRNA.data + * most callers need to know if the resulting pointer was found and not null. + */ +bool RNA_path_resolve_full_maybe_null( + PointerRNA *ptr, const char *path, PointerRNA *r_ptr, PropertyRNA **r_prop, int *r_index) +{ + return rna_path_parse(ptr, path, r_ptr, r_prop, r_index, NULL, NULL, true); +} + /** * Resolve the given RNA Path to find both the pointer AND property * indicated by fully resolving the path. -- cgit v1.2.3