diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-12 19:59:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-06-12 20:01:54 +0300 |
| commit | fd8d245e6a800cdce29065fe213a195ec9a98b63 (patch) | |
| tree | 159feb841382b4fd56c1e179673632b880973189 /source/blender/makesdna/DNA_ID.h | |
| parent | b586f801fc921f9f420260fb3ff4f26cb6773157 (diff) | |
LibOverride: Remove 'auto override' option.
Now all overrides are handled that way. Performances of the process look
decent enough, even with production characters...
If performance issues still arise, we'll investigate other solutions.
This should also make T73154 obsolete now.
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 4f2bbc4ee73..38115dad023 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -225,9 +225,6 @@ typedef struct IDOverrideLibrary { /** List of IDOverrideProperty structs. */ ListBase properties; - short flag; - char _pad[6]; - /* Read/write data. */ /* Temp ID storing extra override data (used for differential operations only currently). * Always NULL outside of read/write context. */ @@ -236,10 +233,6 @@ typedef struct IDOverrideLibrary { IDOverrideLibraryRuntime *runtime; } IDOverrideLibrary; -enum eOverrideLibrary_Flag { - OVERRIDE_LIBRARY_AUTO = 1 << 0, /* Allow automatic generation of overriding rules. */ -}; - /* watch it: Sequence has identical beginning. */ /** * ID is the first thing included in all serializable types. It @@ -482,10 +475,6 @@ typedef enum ID_Type { #define ID_IS_OVERRIDE_LIBRARY_TEMPLATE(_id) \ (((ID *)(_id))->override_library != NULL && ((ID *)(_id))->override_library->reference == NULL) -#define ID_IS_OVERRIDE_LIBRARY_AUTO(_id) \ - (!ID_IS_LINKED((_id)) && ID_IS_OVERRIDE_LIBRARY((_id)) && \ - (((ID *)(_id))->override_library->flag & OVERRIDE_LIBRARY_AUTO)) - /* Check whether datablock type is covered by copy-on-write. */ #define ID_TYPE_IS_COW(_id_type) (!ELEM(_id_type, ID_BR, ID_PAL, ID_IM)) |