Commit: 2281db72b015785b08a1713742902ad8174e8cda
Author: Bastien Montagne
Date: Thu Mar 25 22:27:00 2021 +0100
Branches: master
https://developer.blender.org/rB2281db72b015785b08a1713742902ad8174e8cda
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.
===================================================================
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/lib_override.c
===================================================================
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
