Revision: 23516
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23516
Author: mxcurioni
Date: 2009-09-28 06:12:06 +0200 (Mon, 28 Sep 2009)
Log Message:
-----------
Integrated Freestyle to rendering pipeline
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/SConscript
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
2009-09-28 03:56:31 UTC (rev 23515)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
2009-09-28 04:12:06 UTC (rev 23516)
@@ -92,6 +92,8 @@
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
+#include "FRS_freestyle_config.h"
+
//XXX #include "nla.h"
#ifdef WIN32
@@ -824,6 +826,7 @@
srl->lay= (1<<20) -1;
srl->layflag= 0x7FFF; /* solid ztra halo edge strand */
srl->passflag= SCE_PASS_COMBINED|SCE_PASS_Z;
+ FRS_add_freestyle_config( srl );
}
/* render simplification */
Modified: branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
2009-09-28 03:56:31 UTC (rev 23515)
+++ branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
2009-09-28 04:12:06 UTC (rev 23516)
@@ -29,7 +29,7 @@
SET(INC
intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
extern/include ../blenkernel ../imbuf
- ../include ../../kernel/gen_messaging ../blenloader
+ ../include ../../kernel/gen_messaging ../blenloader ../freestyle
../../../intern/smoke/extern
../makesrna
)
Modified: branches/soc-2008-mxcurioni/source/blender/render/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/SConscript
2009-09-28 03:56:31 UTC (rev 23515)
+++ branches/soc-2008-mxcurioni/source/blender/render/SConscript
2009-09-28 04:12:06 UTC (rev 23516)
@@ -6,7 +6,7 @@
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna
../makesrna'
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../include ../blenloader ../../../intern/smoke/extern'
+incs += ' ../include ../blenloader ../freestyle ../../../intern/smoke/extern'
defs = []
Modified:
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
2009-09-28 03:56:31 UTC (rev 23515)
+++ branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
2009-09-28 04:12:06 UTC (rev 23516)
@@ -66,6 +66,9 @@
#include "RE_pipeline.h"
+#include "FRS_freestyle.h"
+#include "FRS_freestyle_config.h"
+
/* internal */
#include "render_types.h"
#include "renderpipeline.h"
@@ -596,6 +599,7 @@
rl->lay= (1<<20) -1;
rl->layflag= 0x7FFF; /* solid ztra halo strand */
rl->passflag= SCE_PASS_COMBINED;
+ FRS_add_freestyle_config( srl );
re->r.actlay= 0;
}
@@ -1709,6 +1713,10 @@
if(!re->test_break(re->tbh))
add_halo_flare(re);
+ /* Freestyle */
+ if( re->r.mode & R_EDGE_FRS && re->r.renderer==R_INTERN)
+ FRS_add_Freestyle(re);
+
/* free all render verts etc */
RE_Database_Free(re);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
