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 | |
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')
6 files changed, 14 insertions, 10 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); diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 436cdbfe6b5..dbf3fa8349e 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -833,17 +833,18 @@ void Controller::ResetRenderCount() _render_count = 0; } -Render *Controller::RenderStrokes(Render *re) +Render *Controller::RenderStrokes(Render *re, bool render) { _Chrono.start(); BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(re, ++_render_count); - _Canvas->Render(blenderRenderer); + if (render) + _Canvas->Render(blenderRenderer); real d = _Chrono.stop(); if (G.debug & G_DEBUG_FREESTYLE) { cout << "Temporary scene generation: " << d << endl; } _Chrono.start(); - Render *freestyle_render = blenderRenderer->RenderScene(re); + Render *freestyle_render = blenderRenderer->RenderScene(re, render); d = _Chrono.stop(); if (G.debug & G_DEBUG_FREESTYLE) { cout << "Stroke rendering : " << d << endl; diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 3315fe7e20b..c8eaaf5486b 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -86,7 +86,7 @@ public: void toggleEdgeTesselationNature(Nature::EdgeNature iNature); void DrawStrokes(); void ResetRenderCount(); - Render *RenderStrokes(Render *re); + Render *RenderStrokes(Render *re, bool render); void SwapStyleModules(unsigned i1, unsigned i2); void InsertStyleModule(unsigned index, const char *iFileName); void InsertStyleModule(unsigned index, const char *iName, struct Text *iText); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 294da904497..096447de214 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -476,7 +476,7 @@ Object *BlenderStrokeRenderer::NewMesh() const return ob; } -Render *BlenderStrokeRenderer::RenderScene(Render *re) +Render *BlenderStrokeRenderer::RenderScene(Render *re, bool render) { Camera *camera = (Camera *)freestyle_scene->camera->data; if (camera->clipend < _z) @@ -489,7 +489,7 @@ Render *BlenderStrokeRenderer::RenderScene(Render *re) Render *freestyle_render = RE_NewRender(freestyle_scene->id.name); - RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene); + RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene, render); return freestyle_render; } 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; 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; |