diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-03-01 13:27:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-03-01 13:27:24 +0300 |
| commit | 9def00a8ca8307c28ba064dbf80869ab00235711 (patch) | |
| tree | 3147f94d7c1f65c4998051128c4970292021461f | |
| parent | ca63729a5b0e03aeee625aa51d7f3f2b22dc6282 (diff) | |
Work around T86015: Crash undoing in certain scenario (disabling Global Undo).
Simply disable advanced 're-use current blend data` process when loading
a memfile step and Global Undo is disabled, since there is no way to
ensure we have a proper 'differential' state in the stack then.
NOTE: this is a quick work-around to fix the crash, not a satisfying
solution by far (pretty sure there can still be crashes if you then
re-enable Global Undo afterwards e.g.).
| -rw-r--r-- | source/blender/editors/undo/memfile_undo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index 4fd8c180a4b..9189adaf4d1 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -152,7 +152,7 @@ static void memfile_undosys_step_decode(struct bContext *C, bool use_old_bmain_data = true; - if (USER_EXPERIMENTAL_TEST(&U, use_undo_legacy)) { + if (USER_EXPERIMENTAL_TEST(&U, use_undo_legacy) || !(U.uiflag & USER_GLOBALUNDO)) { use_old_bmain_data = false; } else if (undo_direction == STEP_REDO) { |