diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-01-15 21:27:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-01-15 21:27:49 +0300 |
| commit | 2aa7bc06e7a6adb196e552fca3289ed7b7a18f3f (patch) | |
| tree | 5dd8be8f80e48b7344a1f31cb540a593a42507f1 /source/blender/makesdna | |
| parent | ce317c9faa00c16437f001ac13934277de566a23 (diff) | |
LibOverride: Also consider regular embedded IDs as virtual overrides.
Those (aka root node trees and master collections) share same 'traits'
as the shapekeys: RNA cannot assign them, so we need to handle them as
sub-data of their owner IDs.
Not sure how much this will help in improving support of overrides for
scenes and nodetrees, but this is a mandatory step towards that goal for
sure.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 263ce2203e9..840b9e23edf 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -515,7 +515,7 @@ typedef enum ID_Type { ((const ID *)(_id))->override_library->reference != NULL) #define ID_IS_OVERRIDE_LIBRARY_VIRTUAL(_id) \ - ((((const ID *)(_id))->flag & LIB_EMBEDDED_DATA_LIB_OVERRIDE) != 0) + ((((const ID *)(_id))->flag & (LIB_EMBEDDED_DATA_LIB_OVERRIDE | LIB_EMBEDDED_DATA)) != 0) #define ID_IS_OVERRIDE_LIBRARY(_id) \ (ID_IS_OVERRIDE_LIBRARY_REAL(_id) || ID_IS_OVERRIDE_LIBRARY_VIRTUAL(_id)) |