Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-04-14 21:24:02 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-04-14 21:24:02 +0400
commit86f306f1d90a48a9efe72a8ef4faf6b5fa41f8e0 (patch)
tree3940691c35dc8d8d754dc4c8817f8533f8bbcba3
parentdfe26156fa35d54caf7c52f3acae7f005e25467b (diff)
Freestyle stroke rendering is now done before lens flare. Suggested by Ton on IRC.
-rw-r--r--source/blender/render/intern/source/pipeline.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index bced355c4f0..da756447f96 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1082,17 +1082,17 @@ static void do_render_3d(Render *re)
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);