diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-24 05:39:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-24 05:39:36 +0300 |
| commit | f029aefe3e051d213292cf0d9be20d5438ca618f (patch) | |
| tree | 8f332d60851f37b031dd23b1cec9334fc02e9fa0 /source/blender/editors/undo | |
| parent | 6a5bc88abfbbf4330ba0f1c4ea0b0366c42af3e1 (diff) | |
| parent | 9abc2dfa4933266b7f385b75c65527d512441363 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/undo')
| -rw-r--r-- | source/blender/editors/undo/ed_undo.c | 4 |
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 ffe4008f7d6..279f3e7cf38 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -118,9 +118,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 */ |