diff options
| author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2018-09-24 19:08:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 19:09:21 +0300 |
| commit | 50731ff5963a058c86e45d153de56b74b9f27176 (patch) | |
| tree | d5bf796ee3d9357fea38b0b89d6fe32f5199d768 /source/blender/render | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Fix T56861: freestyle + BI + full sample AA not working correct.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 97971030dfb..4f2f8d67f45 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2454,6 +2454,13 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree) BLI_rw_mutex_unlock(&re->resultmutex); render_result_uncrop(re1); } +#ifdef WITH_FREESTYLE + else if (re1->r.mode & R_EDGE_FRS) { + BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE); + composite_freestyle_renders(re1, 0); + BLI_rw_mutex_unlock(&re->resultmutex); + } +#endif ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */ } } |