griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add utility function to compare PointerRNA with NULL

Browse Source 
Thanks Campbell for review!
This commit is contained in:
Sergey Sharybin
2017-12-04 16:23:14 +01:00
parent a68e10be5e
commit aed1320b24
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesrna/RNA_access.h
View File

@@ -724,6 +724,7 @@ extern StructRNA RNA_XorController;
void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr); void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr);
void RNA_id_pointer_create(struct ID *id, PointerRNA *r_ptr); void RNA_id_pointer_create(struct ID *id, PointerRNA *r_ptr);
void RNA_pointer_create(struct ID *id, StructRNA *type, void *data, PointerRNA *r_ptr); void RNA_pointer_create(struct ID *id, StructRNA *type, void *data, PointerRNA *r_ptr);
bool RNA_pointer_is_null(const PointerRNA *ptr);
bool RNA_path_resolved_create( bool RNA_path_resolved_create(
PointerRNA *ptr, struct PropertyRNA *prop, PointerRNA *ptr, struct PropertyRNA *prop,

5
source/blender/makesrna/intern/rna_access.c
View File

@@ -172,6 +172,11 @@ void RNA_pointer_create(ID *id, StructRNA *type, void *data, PointerRNA *r_ptr)
} }
} }
bool RNA_pointer_is_null(const PointerRNA *ptr)
{
return !((ptr->data != NULL) && (ptr->id.data != NULL) && (ptr->type != NULL));
}
static void rna_pointer_inherit_id(StructRNA *type, PointerRNA *parent, PointerRNA *ptr) static void rna_pointer_inherit_id(StructRNA *type, PointerRNA *parent, PointerRNA *ptr)
{ {
if (type && type->flag & STRUCT_ID) { if (type && type->flag & STRUCT_ID) {