[Bf-blender-cvs] [79dd9fedb24] master: Fix T84758: Revert "LibOverride: Also consider regular embedded IDs as virtual overrides."
Bastien Montagne
noreply at git.blender.org
Sat Jan 16 10:30:26 CET 2021
Commit: 79dd9fedb242c34646df1af951b8d810ec30c787
Author: Bastien Montagne
Date: Sat Jan 16 10:28:47 2021 +0100
Branches: master
https://developer.blender.org/rB79dd9fedb242c34646df1af951b8d810ec30c787
Fix T84758: Revert "LibOverride: Also consider regular embedded IDs as virtual overrides."
This made Blender considers all materials to be overridden.
This reverts commit 2aa7bc06e7a6adb196e552fca3289ed7b7a18f3f.
===================================================================
M source/blender/makesdna/DNA_ID.h
===================================================================
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 840b9e23edf..263ce2203e9 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 | 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))
More information about the Bf-blender-cvs
mailing list