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/object.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/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index bf4e32ef122..f0819d426fb 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -115,7 +115,9 @@ #include "GPU_material.h" -#include "FRS_freestyle.h" +#ifdef WITH_FREESTYLE +# include "FRS_freestyle.h" +#endif /* Local function protos */ float originmat[3][3]; /* after BKE_object_where_is_calc(), can be used in other functions (bad!) */ @@ -635,6 +637,7 @@ void BKE_object_unlink(Object *ob) SEQ_END } +#ifdef WITH_FREESTYLE { SceneRenderLayer *srl; @@ -642,6 +645,7 @@ void BKE_object_unlink(Object *ob) FRS_unlink_target_object(&srl->freestyleConfig, ob); } } +#endif } sce = sce->id.next; |