From 50731ff5963a058c86e45d153de56b74b9f27176 Mon Sep 17 00:00:00 2001 From: IRIE Shinsuke Date: Mon, 24 Sep 2018 18:08:24 +0200 Subject: Fix T56861: freestyle + BI + full sample AA not working correct. --- source/blender/render/intern/source/pipeline.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/render') 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 */ } } -- cgit v1.2.3