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/blenkernel/intern/scene.c | |
| 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/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 5e6d7647d1d..1c98f6c32a2 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -85,7 +85,9 @@ //XXX #include "BIF_previewrender.h" //XXX #include "BIF_editseq.h" -#include "FRS_freestyle_config.h" +#ifdef WITH_FREESTYLE +# include "FRS_freestyle_config.h" +#endif #ifdef WIN32 #else @@ -288,7 +290,6 @@ Scene *BKE_scene_copy(Scene *sce, int type) void BKE_scene_free(Scene *sce) { Base *base; - SceneRenderLayer *srl; base = sce->base.first; while (base) { @@ -329,9 +330,15 @@ void BKE_scene_free(Scene *sce) sce->r.ffcodecdata.properties = NULL; } - for(srl= sce->r.layers.first; srl; srl= srl->next) { - FRS_free_freestyle_config(srl); +#ifdef WITH_FREESTYLE + { + SceneRenderLayer *srl; + + for (srl = sce->r.layers.first; srl; srl = srl->next) { + FRS_free_freestyle_config(srl); + } } +#endif BLI_freelistN(&sce->markers); BLI_freelistN(&sce->transform_spaces); @@ -1190,7 +1197,9 @@ SceneRenderLayer *BKE_scene_add_render_layer(Scene *sce, const char *name) 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 ); +#ifdef WITH_FREESTYLE + FRS_add_freestyle_config(srl); +#endif return srl; } |