From c80e9866c8615c1742bc74506f8c8fe574552777 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 9 May 2014 12:32:26 -0300 Subject: Revert "Fix wrong job type used in cycles bake operator, could cause crashes." This reverts commit 97823f604796fb008fef03653974473ece75d18e. I was to push a fix based on Brecht's solution (this commit) when he did the same. This fix is correct, but it misses replacing WM_JOB_TYPE_OBJECT_BAKE with WM_JOB_OBJECT_BAKE_TEXTURE in the rest of the file, which may lead to problems when calling the operator in a quickly sucession - WM_jobs_test also tests for the same type of JOB. I created WM_JOB_TYPE_OBJECT_BAKE elsewhere, may as well use it. Unless we revert 20c90ea and f194da3. I'm fine with either way, just trying to get master to work again ;) --- source/blender/editors/object/object_bake_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 91cb80e7df8..46555f89da9 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_TEXTURE)) + if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE)) return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH; /* running render */ @@ -1107,4 +1107,3 @@ 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