diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-22 12:04:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-22 12:04:16 +0400 |
commit | 9b28ab26b4d5624f253efff42b9b61b18f29fe5c (patch) | |
tree | 73be0a6e72f8b1758d34b4218752c2d1b8dcde74 /source/blender/render | |
parent | ef0883bc2b70f60400f68dd24822d30e1b483725 (diff) |
Freestyle: disallow with fields (was crashing)
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index f57520ef035..7e6d2122330 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2660,7 +2660,16 @@ bool RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList * } #endif } - + +#ifdef WITH_FREESTYLE + if (scene->r.mode & R_EDGE_FRS) { + if (scene->r.mode & R_FIELDS) { + BKE_report(reports, RPT_ERROR, "Fields not supported in Freestyle"); + return false; + } + } +#endif + /* layer flag tests */ if (!render_scene_has_layers_to_render(scene)) { BKE_report(reports, RPT_ERROR, "All render layers are disabled"); |