[Bf-blender-cvs] [ed184050b6e] master: Fix T78958: Library Override crash: undo make local.
Bastien Montagne
noreply at git.blender.org
Mon Jul 20 15:36:36 CEST 2020
Commit: ed184050b6e787bbfb218e8ad2a0108172a1b68c
Author: Bastien Montagne
Date: Mon Jul 20 15:35:52 2020 +0200
Branches: master
https://developer.blender.org/rBed184050b6e787bbfb218e8ad2a0108172a1b68c
Fix T78958: Library Override crash: undo make local.
===================================================================
M source/blender/blenkernel/intern/lib_override.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index a6e2b6a7835..fc84ec0b314 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1120,11 +1120,11 @@ void BKE_lib_override_library_main_operations_create(Main *bmain, const bool for
TaskPool *task_pool = BLI_task_pool_create(bmain, TASK_PRIORITY_HIGH);
FOREACH_MAIN_ID_BEGIN (bmain, id) {
- if ((ID_IS_OVERRIDE_LIBRARY_REAL(id) && force_auto) ||
- (id->tag & LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH)) {
+ if (ID_IS_OVERRIDE_LIBRARY_REAL(id) &&
+ (force_auto || (id->tag & LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH))) {
BLI_task_pool_push(task_pool, lib_override_library_operations_create_cb, id, false, NULL);
- id->tag &= ~LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH;
}
+ id->tag &= ~LIB_TAG_OVERRIDE_LIBRARY_AUTOREFRESH;
}
FOREACH_MAIN_ID_END;
More information about the Bf-blender-cvs
mailing list