[Bf-blender-cvs] [df5237ec5e3] master: LibOverride: Fix broken logic in code checking and adding new override ops.

Bastien Montagne noreply at git.blender.org
Thu Aug 22 14:34:38 CEST 2019


Commit: df5237ec5e3e43627a997ba97baeffd991aa3735
Author: Bastien Montagne
Date:   Thu Aug 22 14:28:31 2019 +0200
Branches: master
https://developer.blender.org/rBdf5237ec5e3e43627a997ba97baeffd991aa3735

LibOverride: Fix broken logic in code checking and adding new override ops.

When we wanted to force all overidable IDs to be checked, code would end
up checking the whole Main DB, instead of only overrideable ones.

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

M	source/blender/blenkernel/intern/library_override.c

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

diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index e435f07e38d..ce368575492 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -628,7 +628,7 @@ void BKE_main_override_library_operations_create(Main *bmain, const bool force_a
   ID *id;
 
   FOREACH_MAIN_ID_BEGIN (bmain, id) {
-    if (force_auto ||
+    if ((ID_IS_OVERRIDE_LIBRARY(id) && force_auto) ||
         (ID_IS_OVERRIDE_LIBRARY_AUTO(id) && (id->tag & LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH))) {
       BKE_override_library_operations_create(bmain, id, force_auto);
       id->tag &= ~LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH;



More information about the Bf-blender-cvs mailing list