diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-07-10 16:23:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-07-10 16:23:52 +0300 |
| commit | f93e0f1a9eefb162cf9432240b101a5d9c372910 (patch) | |
| tree | d2dc213894c937241d1e72eff888964217a28b84 /source/blender/makesrna/intern/rna_internal.h | |
| parent | 337e2c902930d8a8980505d66234bc46c95b051c (diff) | |
Refactor override code to properly deal with runtime rna properties too.
The triplet static RNA / runtime RNA / custom properties is a real pain to
deal with...
Using the new `PropertyRNAOrID` struct helps clarifying and properly
dealing with all three cases.
Note that this makes override of py-defined RNA properties working
(support for that will be committed next).
Differential Revision: https://developer.blender.org/D8249
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 0783addd78b..8e6a360f2c9 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -489,12 +489,8 @@ struct PropertyRNA *rna_ensure_property_realdata(struct PropertyRNA **prop, * Not obvious though, those are fairly more complicated than basic SDNA access. */ int rna_property_override_diff_default(struct Main *bmain, - struct PointerRNA *ptr_a, - struct PointerRNA *ptr_b, - struct PropertyRNA *prop_a, - struct PropertyRNA *prop_b, - const int len_a, - const int len_b, + struct PropertyRNAOrID *prop_a, + struct PropertyRNAOrID *prop_b, const int mode, struct IDOverrideLibrary *override, const char *rna_path, |