Merge branch 'blender-v4.4-release'

2025-02-20 19:21:33 +01:00
parent c114ac97be 878e5dc0c5
commit 83874e6ce5
1 changed files with 5 additions and 0 deletions
--- a/source/blender/editors/render/render_shading.cc
+++ b/source/blender/editors/render/render_shading.cc
@@ -1442,6 +1442,11 @@ static int lightprobe_cache_bake_invoke(bContext *C, wmOperator *op, const wmEve

  wmJob *wm_job = EEVEE_NEXT_lightbake_job_create(
      wm, win, bmain, view_layer, scene, probes, data->report, scene->r.cfra, 0);
+  if (wm_job == nullptr) {
+    MEM_delete(data);
+    BKE_report(op->reports, RPT_WARNING, "Can't bake light probe while rendering");
+    return OPERATOR_CANCELLED;
+  }

  WM_event_add_modal_handler(C, op);