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/intern/blender_interface/BlenderStrokeRenderer.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/intern/blender_interface/BlenderStrokeRenderer.h')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index 4d34f70f689..ae0e6bed3b2 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -51,7 +51,7 @@ public: Object *NewMesh() const; - Render *RenderScene(Render *re); + Render *RenderScene(Render *re, bool render); protected: Main *freestyle_bmain; |