Fix #120421: Animated "Burn metadata into image" ignored during render #120429
|
@ -1358,7 +1358,7 @@ static void renderresult_stampinfo(Render *re)
|
|||
Object *ob_camera_eval = DEG_get_evaluated_object(re->pipeline_depsgraph, RE_GetCamera(re));
|
||||
BKE_image_stamp_buf(re->scene,
|
||||
ob_camera_eval,
|
||||
(re->r.stamp & R_STAMP_STRIPMETA) ? rres.stamp_data : nullptr,
|
||||
(re->scene->r.stamp & R_STAMP_STRIPMETA) ? rres.stamp_data : nullptr,
|
||||
rres.ibuf->byte_buffer.data,
|
||||
rres.ibuf->float_buffer.data,
|
||||
rres.rectx,
|
||||
|
@ -1456,7 +1456,7 @@ static void do_render_sequencer(Render *re)
|
|||
/* copy ibuf into combined pixel rect */
|
||||
RE_render_result_rect_from_ibuf(rr, ibuf_arr[view_id], view_id);
|
||||
|
||||
if (ibuf_arr[view_id]->metadata && (re->r.stamp & R_STAMP_STRIPMETA)) {
|
||||
if (ibuf_arr[view_id]->metadata && (re->scene->r.stamp & R_STAMP_STRIPMETA)) {
|
||||
/* ensure render stamp info first */
|
||||
BKE_render_result_stamp_info(nullptr, nullptr, rr, true);
|
||||
BKE_stamp_info_from_imbuf(rr, ibuf_arr[view_id]);
|
||||
|
@ -1537,7 +1537,7 @@ static void do_render_full_pipeline(Render *re)
|
|||
/* save render result stamp if needed */
|
||||
if (re->result != nullptr) {
|
||||
/* sequence rendering should have taken care of that already */
|
||||
if (!(render_seq && (re->r.stamp & R_STAMP_STRIPMETA))) {
|
||||
if (!(render_seq && (re->scene->r.stamp & R_STAMP_STRIPMETA))) {
|
||||
Object *ob_camera_eval = DEG_get_evaluated_object(re->pipeline_depsgraph, RE_GetCamera(re));
|
||||
BKE_render_result_stamp_info(re->scene, ob_camera_eval, re->result, false);
|
||||
}
|
||||
|
@ -1545,7 +1545,7 @@ static void do_render_full_pipeline(Render *re)
|
|||
renderresult_set_passes_metadata(re);
|
||||
|
||||
/* stamp image info here */
|
||||
if ((re->r.stamp & R_STAMP_ALL) && (re->r.stamp & R_STAMP_DRAW)) {
|
||||
if ((re->scene->r.stamp & R_STAMP_ALL) && (re->scene->r.stamp & R_STAMP_DRAW)) {
|
||||
renderresult_stampinfo(re);
|
||||
re->display_update(re->result, nullptr);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue