From cc92d83d398854f461fe042959c384306d38320a Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 4 Oct 2018 11:24:17 +0200 Subject: Fix T57011: Crash pressing Free Light Cache during Indirect Light Cache Baking just kill the bake job prior to freeing Reviewed By: fclem Differential Revision: https://developer.blender.org/D3764 --- source/blender/editors/render/render_shading.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/render') diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 78d3373c88c..43680107dbd 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -833,6 +833,10 @@ static int light_cache_free_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); + /* kill potential bake job first (see T57011) */ + wmWindowManager *wm = CTX_wm_manager(C); + WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_LIGHT_BAKE); + if (!scene->eevee.light_cache) { return OPERATOR_CANCELLED; } -- cgit v1.2.3