blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

RNA property management: tweak to 'is set' information. 

Only consider a full IDProperty as set if it actually exists in given
PointerRNA data.
This commit is contained in:
Bastien Montagne 2020-07-13 12:47:49 +02:00
parent 0158571b34
commit f8afbb7657
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,7 +560,10 @@ static PropertyRNA *arraytypemap[IDP_NUMTYPES] = {
/* This function initializes a PropertyRNAOrID with all required info, from a given PropertyRNA
* and PointerRNA data. It deals properly with the three cases (static RNA, runtime RNA, and
* IDProperty). */
* IDProperty).
* WARNING: given `ptr` PointerRNA is assumed to be a valid data one here, calling code is
* responsible to ensure that.
*/
void rna_property_rna_or_id_get(PropertyRNA *prop,
PointerRNA *ptr,
PropertyRNAOrID *r_prop_rna_or_id)
@ -617,8 +620,8 @@ void rna_property_rna_or_id_get(PropertyRNA *prop,
r_prop_rna_or_id->idprop = idprop_evaluated;
r_prop_rna_or_id->is_idprop = true;
/* Full IDProperties are always set. */
r_prop_rna_or_id->is_set = true;
/* Full IDProperties are always set, if it exists. */
r_prop_rna_or_id->is_set = (idprop_evaluated != NULL);
r_prop_rna_or_id->identifier = idprop->name;
if (idprop->type == IDP_ARRAY) {