blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix T84758: Revert "LibOverride: Also consider regular embedded IDs as virtual overrides." 

This made Blender considers all materials to be overridden.

This reverts commit 2aa7bc06e7.
This commit is contained in:
Bastien Montagne 2021-01-16 10:28:47 +01:00
parent 3cc1bcce4f
commit 79dd9fedb2
Notes: blender-bot 2023-02-13 23:39:48 +01:00 
Referenced by issue #84887, Blender 2.93.0 Alpha Materials
Referenced by issue #84786, Startup.blend not having a Collection crashes Blender when trying to add any new objects.
Referenced by issue #84773, gITF 2.0 Import error "could not link (...) Master collection overridden"
Referenced by issue #84758, Blender considers all materials to be overridden
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesdna/DNA_ID.h
View File

@ -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 | LIB_EMBEDDED_DATA)) != 0)
((((const ID *)(_id))->flag & LIB_EMBEDDED_DATA_LIB_OVERRIDE) != 0)
#define ID_IS_OVERRIDE_LIBRARY(_id) \
(ID_IS_OVERRIDE_LIBRARY_REAL(_id) || ID_IS_OVERRIDE_LIBRARY_VIRTUAL(_id))