tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Sergey Sharybin 2024-03-15 15:24:52 +01:00
parent 16015ae507 e2d7bd199e
commit 444bc3154a
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/render/intern/pipeline.cc
View File

@ -1327,6 +1327,23 @@ static void do_render_compositor(Render *re)
}
}
static void renderresult_set_passes_metadata(Render *re)
{
RenderResult *render_result = re->result;
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
LISTBASE_FOREACH (RenderLayer *, render_layer, &render_result->layers) {
LISTBASE_FOREACH_BACKWARD (RenderPass *, render_pass, &render_layer->passes) {
if (render_pass->ibuf) {
BKE_imbuf_stamp_info(render_result, render_pass->ibuf);
}
}
}
BLI_rw_mutex_unlock(&re->resultmutex);
}
static void renderresult_stampinfo(Render *re)
{
RenderResult rres;
@ -1524,6 +1541,8 @@ static void do_render_full_pipeline(Render *re)
BKE_render_result_stamp_info(re->scene, ob_camera_eval, re->result, false);
}
renderresult_set_passes_metadata(re);
/* stamp image info here */
if ((re->r.stamp & R_STAMP_ALL) && (re->r.stamp & R_STAMP_DRAW)) {
renderresult_stampinfo(re);