[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43505] branches/soc-2008-mxcurioni/source /blender/render/intern/source/pipeline.c: Fix for a crash with FSAA enabled and Freestyle disabled.

[Tamito Kajiyama]

Revision: 43505
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43505
Author:   kjym3
Date:     2012-01-18 21:38:33 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Fix for a crash with FSAA enabled and Freestyle disabled.
Problem report by Victor / tokiop, many thanks!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c

Modified: 
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c  
2012-01-18 21:12:51 UTC (rev 43504)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c  
2012-01-18 21:38:33 UTC (rev 43505)
@@ -1476,7 +1476,8 @@
                                        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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs