[Bf-blender-cvs] [2aa7bc06e7a] master: LibOverride: Also consider regular embedded IDs as virtual overrides.

Bastien Montagne noreply at git.blender.org
Fri Jan 15 19:36:59 CET 2021


Commit: 2aa7bc06e7a6adb196e552fca3289ed7b7a18f3f
Author: Bastien Montagne
Date:   Fri Jan 15 19:27:49 2021 +0100
Branches: master
https://developer.blender.org/rB2aa7bc06e7a6adb196e552fca3289ed7b7a18f3f

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.

===================================================================

M	source/blender/makesdna/DNA_ID.h

===================================================================

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))



More information about the Bf-blender-cvs mailing list