diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/render/intern/include | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 45080de3148..c45c6dfc1bc 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -228,7 +228,9 @@ struct Render ListBase volumes; ListBase volume_precache_parts; +#ifdef WITH_FREESTYLE ListBase freestyle_renders; +#endif /* arena for allocating data for use during render, for * example dynamic TFaces to go in the VlakRen structure. @@ -382,7 +384,9 @@ typedef struct VlakRen { struct Material *mat; char puno; char flag, ec; +#ifdef WITH_FREESTYLE char freestyle_edge_mark; +#endif int index; } VlakRen; @@ -615,11 +619,13 @@ typedef struct LampRen { #define R_TRACEBLE 128 /* vlakren->freestyle_edge_mark */ -#define R_EDGE_V1V2 1 -#define R_EDGE_V2V3 2 -#define R_EDGE_V3V4 4 -#define R_EDGE_V3V1 4 -#define R_EDGE_V4V1 8 +#ifdef WITH_FREESTYLE +# define R_EDGE_V1V2 1 +# define R_EDGE_V2V3 2 +# define R_EDGE_V3V4 4 +# define R_EDGE_V3V1 4 +# define R_EDGE_V4V1 8 +#endif /* strandbuffer->flag */ #define R_STRAND_BSPLINE 1 |