[Bf-blender-cvs] [e22a36e80a1] master: Cleanup: Use proper `RNA_pointer_is_null` helper.

Bastien Montagne noreply at git.blender.org
Tue Dec 29 12:13:30 CET 2020


Commit: e22a36e80a1e2723e8d9f2b9a39b5d61d6b4b6ec
Author: Bastien Montagne
Date:   Tue Dec 29 12:11:18 2020 +0100
Branches: master
https://developer.blender.org/rBe22a36e80a1e2723e8d9f2b9a39b5d61d6b4b6ec

Cleanup: Use proper `RNA_pointer_is_null` helper.

Followup to rB7f3601e70dd and rBad63d2f60e2.

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

M	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 9411acaef64..0479c5d1eed 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -5730,7 +5730,7 @@ static char *rna_idp_path(PointerRNA *ptr,
     if (iter->type == IDP_GROUP) {
       if (prop->type == PROP_POINTER) {
         PointerRNA child_ptr = RNA_property_pointer_get(ptr, prop);
-        BLI_assert(child_ptr.type != NULL);
+        BLI_assert(!RNA_pointer_is_null(&child_ptr));
         link.name = iter->name;
         link.index = -1;
         if ((path = rna_idp_path(&child_ptr, iter, needle, &link))) {
@@ -5752,7 +5752,7 @@ static char *rna_idp_path(PointerRNA *ptr,
         for (j = 0; j < iter->len; j++, array++) {
           PointerRNA child_ptr;
           if (RNA_property_collection_lookup_int(ptr, prop, j, &child_ptr)) {
-            BLI_assert(child_ptr.type != NULL);
+            BLI_assert(!RNA_pointer_is_null(&child_ptr));
             link.index = j;
             if ((path = rna_idp_path(&child_ptr, array, needle, &link))) {
               break;



More information about the Bf-blender-cvs mailing list