diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-01 18:09:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-01 18:11:24 +0300 |
| commit | cb9f9a63e02986bd308dcd4b39ea19586b233167 (patch) | |
| tree | 1e3864b3f398ac74c538cee61630af0e8385cb40 /source/blender/render | |
| parent | d7af7a1e04c243170edffeda3f2feb19605d2aba (diff) | |
Fix wrong information used for stamp when "Strip Metadata" is used
Such configuration used to cause quite confusing situation when
stamp will use actual scene's statistics but metadata from strip
will be used for the saved file (basically, causing different
information stamped and saved as metadata).
Don't think it was desired behavior and it's something what
artists here in the studio wants to be fixed.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 3f7cfa8c690..21b0d70dd75 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -448,6 +448,8 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id) rr->xof = re->disprect.xmin; rr->yof = re->disprect.ymin; + + rr->stamp_data = re->result->stamp_data; } } } @@ -2596,7 +2598,13 @@ static void renderresult_stampinfo(Render *re) for (rv = re->result->views.first;rv;rv = rv->next, nr++) { RE_SetActiveRenderView(re, rv->name); RE_AcquireResultImage(re, &rres, nr); - BKE_image_stamp_buf(re->scene, RE_GetCamera(re), (unsigned char *)rres.rect32, rres.rectf, rres.rectx, rres.recty, 4); + BKE_image_stamp_buf(re->scene, + RE_GetCamera(re), + (re->r.stamp & R_STAMP_STRIPMETA) ? rres.stamp_data : NULL, + (unsigned char *)rres.rect32, + rres.rectf, + rres.rectx, rres.recty, + 4); RE_ReleaseResultImage(re); } } |