From 9c0f557b35acf26fdc95dc118dbf29f91731d2c2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 29 Nov 2011 15:26:46 +0000 Subject: Fix #27328: Undoing an operation while baking fluids freezes Blender Prevent Undo be run if there are any jobs are currently running. This also makes sense with such jobs as multires baker, for example. --- source/blender/editors/util/undo.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/blender/editors/util') diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 527537b5efb..f0055bd6008 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -125,6 +125,12 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) Object *obact= CTX_data_active_object(C); ScrArea *sa= CTX_wm_area(C); + /* 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_has_running(CTX_wm_manager(C))) { + return OPERATOR_CANCELLED; + } + /* grease pencil can be can be used in plenty of spaces, so check it first */ if(ED_gpencil_session_active()) { return ED_undo_gpencil_step(C, step, undoname); -- cgit v1.2.3