diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-09-22 11:51:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-22 11:52:22 +0400 |
commit | ef0883bc2b70f60400f68dd24822d30e1b483725 (patch) | |
tree | 124116ea173c3cdc38a000c54547a4496e66280c /source/blender/render | |
parent | f6db5800410442e63b65c55c65977315bb3e9acd (diff) |
Fix for Freestyle crash in bordered animation rendering
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 32bd67cb1f2..f57520ef035 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1638,6 +1638,10 @@ static void do_render_fields_blur_3d(Render *re) if (re->r.mode & R_BORDER) { if ((re->r.mode & R_CROP) == 0) { RenderResult *rres; + + /* backup */ + const rcti orig_disprect = re->disprect; + const int orig_rectx = re->rectx, orig_recty = re->recty; BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE); @@ -1660,6 +1664,11 @@ static void do_render_fields_blur_3d(Render *re) re->display_init(re->dih, re->result); re->display_update(re->duh, re->result, NULL); + + /* restore the disprect from border */ + re->disprect = orig_disprect; + re->rectx = orig_rectx; + re->recty = orig_recty; } else { /* set offset (again) for use in compositor, disprect was manipulated. */ |