diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-12-18 12:13:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-12-18 12:13:43 +0300 |
| commit | 7ab8c906865dddf2ef6164b6271e4469a3a95319 (patch) | |
| tree | 7604626d0d6c56f6fcf5ca3233ec29bec4c623be /source/blender/makesrna/intern/rna_internal_types.h | |
| parent | 994648a6741087ae40227037ee87395aa18f5b18 (diff) | |
Serious cleanup/refactor/fixing of new RNA comparison code.
Code also handling auto-generation of static overrides.
Aside from some naming consistency cleanup, this commit:
* Is the first step addressing the 'operator' issue with static
overrides, by implementing a first version of the 'restore from
reference' behavior.
* Fixes several issues that were discovered on the way in enhanced
RNA comparision code, like the 'zero-length dynamic array' case, or some
infinite looping caused by some non-ID pointers (that for some
mysterious reasons did not show up previously...).
* Factorizes a bit said RNA comparison code (auto-static override
generation and comparison/check were essentially doing the same thing).
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal_types.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal_types.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index fd0b655e41e..88efff30481 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -121,12 +121,6 @@ typedef int (*PropEnumGetFuncEx)(struct PointerRNA *ptr, struct PropertyRNA *pro typedef void (*PropEnumSetFuncEx)(struct PointerRNA *ptr, struct PropertyRNA *prop, int value); /* Handling override operations, and also comparison. */ -enum { - /* Do not compare properties that are not overridable. */ - RNA_OVERRIDE_COMPARE_IGNORE_NON_OVERRIDABLE = 1 << 0, - /* Do not compare properties that are already overridden. */ - RNA_OVERRIDE_COMPARE_IGNORE_OVERRIDDEN = 1 << 1, -}; /** * If \a override is NULL, merely do comparison between prop_a from ptr_a and prop_b from ptr_b, |