archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for a crash with FSAA enabled and Freestyle disabled.

Browse Source 
Problem report by Victor / tokiop, many thanks!
This commit is contained in:
Tamito Kajiyama
2012-01-18 21:38:33 +00:00
parent e0df491d1e
commit 2453b16717
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/render/intern/source/pipeline.c
View File

@@ -1476,7 +1476,8 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
if(sample) {
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
render_result_exr_file_read(re1, sample);
composite_freestyle_renders(re1, sample);
if( re1->r.mode & R_EDGE_FRS)
composite_freestyle_renders(re1, sample);
BLI_rw_mutex_unlock(&re->resultmutex);
}
ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */