From 97823f604796fb008fef03653974473ece75d18e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 9 May 2014 15:11:57 +0200 Subject: Fix wrong job type used in cycles bake operator, could cause crashes. Ref T40077. --- source/blender/editors/object/object_bake_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index d8e8a31c4ea..319aea147b6 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -77,7 +77,7 @@ static int bake_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { /* no running blender, remove handler and pass through */ - if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE)) + if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE_TEXTURE)) return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH; /* running render */ @@ -1107,3 +1107,4 @@ void OBJECT_OT_bake(wmOperatorType *ot) RNA_def_boolean(ot->srna, "use_automatic_name", false, "Automatic Name", "Automatically name the output file with the pass type"); } + -- cgit v1.2.3