[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56049] trunk/blender/source/blender/ render/intern/source/pipeline.c: Freestyle stroke rendering is now done before lens flare.

[Tamito Kajiyama]

Revision: 56049
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56049
Author:   kjym3
Date:     2013-04-14 17:24:02 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
Freestyle stroke rendering is now done before lens flare.  Suggested by Ton on IRC.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2013-04-14 15:26:35 UTC (rev 56048)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-04-14 17:24:02 UTC (rev 56049)
@@ -1082,17 +1082,17 @@
 	
 	threaded_tile_processor(re);
 	
-	/* do left-over 3d post effects (flares) */
-	if (re->flag & R_HALO)
-		if (!re->test_break(re->tbh))
-			add_halo_flare(re);
-	
 #ifdef WITH_FREESTYLE
 	/* Freestyle  */
 	if (re->r.mode & R_EDGE_FRS)
 		if (!re->test_break(re->tbh))
 			add_freestyle(re);
 #endif
+	
+	/* do left-over 3d post effects (flares) */
+	if (re->flag & R_HALO)
+		if (!re->test_break(re->tbh))
+			add_halo_flare(re);
 		
 	/* free all render verts etc */
 	RE_Database_Free(re);