diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-07-13 17:10:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-07-13 17:11:59 +0300 |
| commit | 88fbf0a8fc1c4192279ebd4c31b66acf05117aa6 (patch) | |
| tree | 7f3d5d0c29888b973c87a8f08ca417f3171d5bc8 /source/blender/makesdna | |
| parent | ccdf189d3c5c3b90dbb95b704f684f1cd1bd192c (diff) | |
Fix (studio-reported) bad remapping of libraries.
New remapper code would also fail in some cases when remapping
libraries, similar to the issue yesterday, because ID_LI type had no
mask value.
That would fail to remap `parent` member of a library to NULL when
deleting that parent, leading to a crash e.g. in Outliner tree building
code.
Reported by @JulienKaspar from Blender studio.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index f6032b71155..d3fc279381f 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -926,6 +926,7 @@ typedef enum IDRecalcFlag { #define FILTER_ID_KE (1ULL << 36) #define FILTER_ID_SCR (1ULL << 37) #define FILTER_ID_WM (1ULL << 38) +#define FILTER_ID_LI (1ULL << 39) #define FILTER_ID_ALL \ (FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA | FILTER_ID_CU_LEGACY | \ @@ -934,7 +935,7 @@ typedef enum IDRecalcFlag { FILTER_ID_OB | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | \ FILTER_ID_SO | FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO | FILTER_ID_CF | \ FILTER_ID_WS | FILTER_ID_LP | FILTER_ID_CV | FILTER_ID_PT | FILTER_ID_VO | FILTER_ID_SIM | \ - FILTER_ID_KE | FILTER_ID_SCR | FILTER_ID_WM) + FILTER_ID_KE | FILTER_ID_SCR | FILTER_ID_WM | FILTER_ID_LI) /** * This enum defines the index assigned to each type of IDs in the array returned by |