Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-10-07 16:20:54 +0300
committerBastien Montagne <bastien@blender.org>2021-10-07 16:20:54 +0300
commit13a28d9e6f12dcba3f97deb20efb0b0761e93db4 (patch)
tree3f22087d77d79bf67e2e943f9cb63e8592185387
parent123255be6b109963bc00fe5b3ea434ecedbde231 (diff)
Fix proxy to override code being called on undos.
-rw-r--r--source/blender/blenkernel/intern/blendfile.c2
1 files changed, 1 insertions, 1 deletions
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);
}