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.

1 files changed, 5 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index d5002d6fa39..8cb44d05b84 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -580,12 +580,15 @@ void FRS_init_stroke_rendering(Render *re)
 	controller->ResetRenderCount();
 }
 
-Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl)
+Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 {
 	Main bmain = {0};
 	Render *freestyle_render = NULL;
 	Text *text, *next_text;
 
+	if (!render)
+		return controller->RenderStrokes(re, false);
+
 	RenderMonitor monitor(re);
 	controller->setRenderMonitor(&monitor);
 
@@ -619,7 +622,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl)
 		re->i.infostr = NULL;
 		freestyle_scene = re->scene;
 		controller->DrawStrokes();
-		freestyle_render = controller->RenderStrokes(re);
+		freestyle_render = controller->RenderStrokes(re, true);
 		controller->CloseFile();
 		freestyle_scene = NULL;