blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Fix possible missing render result with `update_result` 

Need to ensure render result's pixels are allocated prior to merge.

Differential Revision: https://developer.blender.org/D12371
This commit is contained in:
Sergey Sharybin 2021-09-01 17:43:20 +02:00
parent a8739ae6c2
commit 799a2b07ad
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/render/intern/engine.c
View File

@ -365,6 +365,17 @@ RenderResult *RE_engine_begin_result(
return result;
}
static void re_ensure_passes_allocated_thread_safe(Render *re)
{
if (!re->result->passes_allocated) {
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
if (!re->result->passes_allocated) {
render_result_passes_allocated_ensure(re->result);
}
BLI_rw_mutex_unlock(&re->resultmutex);
}
}
void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
{
if (engine->bake.pixels) {
@ -375,6 +386,7 @@ void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
Render *re = engine->re;
if (result) {
re_ensure_passes_allocated_thread_safe(re);
render_result_merge(re->result, result);
result->renlay = result->layers.first; /* weak, draws first layer always */
re->display_update(re->duh, result, NULL);
@ -412,13 +424,7 @@ void RE_engine_end_result(
return;
}
if (!re->result->passes_allocated) {
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
if (!re->result->passes_allocated) {
render_result_passes_allocated_ensure(re->result);
}
BLI_rw_mutex_unlock(&re->resultmutex);
}
re_ensure_passes_allocated_thread_safe(re);
/* merge. on break, don't merge in result for preview renders, looks nicer */
if (!highlight) {