Commit: 13a28d9e6f12dcba3f97deb20efb0b0761e93db4
Author: Bastien Montagne
Date: Thu Oct 7 15:20:54 2021 +0200
Branches: master
https://developer.blender.org/rB13a28d9e6f12dcba3f97deb20efb0b0761e93db4
Fix proxy to override code being called on undos.
===================================================================
M source/blender/blenkernel/intern/blendfile.c
===================================================================
diff --git a/source/blender/blenkernel/intern/blendfile.c
b/source/blender/blenkernel/intern/blendfile.c
index 6957f9b5a69..1213ecc20ee 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -347,7 +347,7 @@ static void setup_app_data(bContext *C,
/* FIXME: Same as above, readfile's `do_version` do not allow to create new
IDs. */
/* TODO: Once this is definitively validated for 3.0 and option to not do it
is removed, add a
* version bump and check here. */
- if (!USER_EXPERIMENTAL_TEST(&U, no_proxy_to_override_conversion)) {
+ if (mode != LOAD_UNDO && !USER_EXPERIMENTAL_TEST(&U,
no_proxy_to_override_conversion)) {
BKE_lib_override_library_main_proxy_convert(bmain, reports);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
