diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-06-11 06:32:01 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-06-11 06:32:01 +0400 |
| commit | 5520331215ffec52cd518f30bdf6e6276840e290 (patch) | |
| tree | 77a5df7b902cb05a3780dd0aff46f851d514c45c /source/blender/freestyle/FRS_freestyle.h | |
| parent | 9020df976ca37104a36a90d43c6e5b33c24cdbd2 (diff) | |
Fix #35561: freestyle + read full sample layers = crash.
Now add_freestyle() in pipeline.c takes a second argument to enable/disable
stroke rendering. When stroke rendering is disabled, the function allocates
data structures but does not perform stroke rendering. The allocated data
structures (mostly left unpopulated with data elements) are intended to allow
for the Read Full Sample Layers (Shift-R) command in the compositor.
Diffstat (limited to 'source/blender/freestyle/FRS_freestyle.h')
| -rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index b10a73277bf..7be51b37f7a 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -45,7 +45,7 @@ void FRS_set_context(struct bContext *C); void FRS_read_file(struct bContext *C); int FRS_is_freestyle_enabled(struct SceneRenderLayer *srl); void FRS_init_stroke_rendering(struct Render *re); -struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl); +struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl, int render); void FRS_finish_stroke_rendering(struct Render *re); void FRS_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render); void FRS_exit(void); |