From 2281db72b015785b08a1713742902ad8174e8cda Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 25 Mar 2021 22:27:00 +0100 Subject: LibOverride: Fix mistake in recent commit. We do not want to re-generate auto-overrides until everything that needed to be resynced has been resynced. Otherwise it's a waste of time and guaranteed loss of some override properties. Mistake in rB9947f2095610 earlier today. --- source/blender/blenkernel/intern/blendfile.c | 2 ++ source/blender/blenkernel/intern/lib_override.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index efbf19c7381..a61e7a2d1d8 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -400,6 +400,8 @@ static void setup_app_data(bContext *C, bmain, curscene, bfd->cur_view_layer ? bfd->cur_view_layer : BKE_view_layer_default_view(curscene)); + /* We need to rebuild some of the deleted override rules (for UI feedback purpose). */ + BKE_lib_override_library_main_operations_create(bmain, true); } } diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 2ee4f1597be..43005afb677 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -1098,8 +1098,6 @@ bool BKE_lib_override_library_resync(Main *bmain, BKE_main_id_clear_newpoins(bmain); BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false); /* That one should not be needed in fact. */ - /* We need to rebuild some of the deleted override rules (for UI feedback purpose). */ - BKE_lib_override_library_main_operations_create(bmain, true); return success; } -- cgit v1.2.3