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:
authorCampbell Barton <ideasman42@gmail.com>2018-08-24 05:36:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-24 05:38:11 +0300
commit9abc2dfa4933266b7f385b75c65527d512441363 (patch)
tree7b7cbb51e279d294f696864d8ef7c2027b0a547a /source/blender
parentb2d32d7fa4b371561b18c68eeeed0d7012850f8c (diff)
Fix T56491: Undo crash while preview jobs run
While the crash is in 2.8, it's possible undo operates on data which isn't only owned by the current scene (any object for eg). Thanks to @mont29 for suggesting the fix.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/undo/ed_undo.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index a13fa4af4e2..621c5d73d5a 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -111,9 +111,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
/* undo during jobs are running can easily lead to freeing data using by jobs,
* or they can just lead to freezing job in some other cases */
- if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY)) {
- return OPERATOR_CANCELLED;
- }
+ WM_jobs_kill_all(wm);
/* TODO(campbell): undo_system: use undo system */
/* grease pencil can be can be used in plenty of spaces, so check it first */