Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

LibOverride: Fix last main issue with overriding custom properties.

Browse Source 
Now, custom props defined as overriddable can be overridden, saved,
reloaded, etc. That fixes the last main issue with them.

Note that custom props still have a lot of glitches and weirdness in
their overriding behavior, but for now the most important is finally
achieved, will let them rest and settle a bit, those have been
incredibly painful to tame... :(
This commit is contained in:
Bastien Montagne
2019-10-03 20:29:38 +02:00
parent 837653d735
commit ba10cd4922
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,7 +393,7 @@ bool RNA_struct_idprops_check(StructRNA *srna)
return (srna && srna->idproperties);
}
static IDProperty *rna_idproperty_find(PointerRNA *ptr, const char *name)
IDProperty *rna_idproperty_find(PointerRNA *ptr, const char *name)
{
IDProperty *group = RNA_struct_idprops(ptr, 0);

15
source/blender/makesrna/intern/rna_access_compare_override.c
View File

@@ -625,6 +625,21 @@ bool RNA_struct_override_matches(Main *bmain,
prop_local = rna_ensure_property_realdata(&prop_local, ptr_local);
prop_reference = rna_ensure_property_realdata(&prop_reference, ptr_reference);
/* IDProps (custom properties) are even more of a PITA here, we cannot use
* `rna_ensure_property_realdata()` to deal with them, we have to use the path generated from
* `prop_local` (which is valid) to access to the actual reference counterpart... */
if (prop_local != NULL && prop_local->magic != RNA_MAGIC && prop_local == prop_reference) {
/* We could also use (lower in this code, after rna_path has been computed):
* RNA_path_resolve_property(ptr_reference, rna_path, &some_rna_ptr, &prop_reference);
* But that would be much more costly, and would also fail when ptr_reference
* is not an ID pointer itself, so we'd need to rebuild it from its owner_id, then check that
* generated some_rna_ptr and ptr_reference do point to the same data, etc.
* For now, let's try that simple access, it won't cover all cases but should handle fine
* most basic custom properties situations. */
prop_reference = (PropertyRNA *)rna_idproperty_find(ptr_reference,
((IDProperty *)prop_local)->name);
}
if (ELEM(NULL, prop_local, prop_reference)) {
continue;
}

1
source/blender/makesrna/intern/rna_access_internal.h
View File

@@ -30,5 +30,6 @@ struct IDProperty;
PropertyRNA *rna_ensure_property(PropertyRNA *prop);
void rna_idproperty_touch(struct IDProperty *idprop);
struct IDProperty *rna_idproperty_find(PointerRNA *ptr, const char *name);
#endif /* __ACCESS_RNA_INTERNAL_H__ */