diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-05 09:48:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-05 09:48:20 +0300 |
| commit | 8e5a4e364530686765daff435047eacddbc1a374 (patch) | |
| tree | 10d6b486bb19c49a370dae30e134b2d181b148b4 /source/blender/editors/render | |
| parent | db907ea888408f7700478ac581aab652df0c2855 (diff) | |
| parent | 6be8b6af4006e088ac4a2cd8c1adc8f18c04035b (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 536252f5003..711f89b9fda 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -945,6 +945,11 @@ static int light_cache_bake_modal(bContext *C, wmOperator *op, const wmEvent *ev /* no running blender, remove handler and pass through */ if (0 == WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) { + LightCache *lcache = scene->eevee.light_cache_data; + if (lcache && (lcache->flag & LIGHTCACHE_INVALID)) { + BKE_report(op->reports, RPT_ERROR, "Lightcache cannot allocate resources"); + return OPERATOR_CANCELLED; + } return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH; } |