[Bf-blender-cvs] [50731ff5963] master: Fix T56861: freestyle + BI + full sample AA not working correct.

IRIE Shinsuke noreply at git.blender.org
Mon Sep 24 18:10:56 CEST 2018


Commit: 50731ff5963a058c86e45d153de56b74b9f27176
Author: IRIE Shinsuke
Date:   Mon Sep 24 18:08:24 2018 +0200
Branches: master
https://developer.blender.org/rB50731ff5963a058c86e45d153de56b74b9f27176

Fix T56861: freestyle + BI + full sample AA not working correct.

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

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 */
 				}
 			}



More information about the Bf-blender-cvs mailing list