Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-05-18 15:47:44 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-18 15:48:13 +0300
commitc55c2dbfbafb78a21d6a0cad85e8293a81c994a0 (patch)
treec95208eef82a218cb59f431bdd8004f484f5c665 /source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
parent00164f3c70aceed2103adbce1c04164e2bc62f6c (diff)
Make sure external engines also render fine with depsgraph + freestyle wip
There is still a crash when using freestyle and Cycles, but the changes here present are harmless
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 58d7e017d71..c1e9a50c860 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -948,7 +948,7 @@ Object *BlenderStrokeRenderer::NewMesh() const
return ob;
}
-Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render)
+Render *BlenderStrokeRenderer::RenderScene(Render *re, bool render)
{
Camera *camera = (Camera *)freestyle_scene->camera->data;
if (camera->clipend < _z)
@@ -960,6 +960,7 @@ Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render)
#endif
Render *freestyle_render = RE_NewRender(freestyle_scene->id.name);
+ freestyle_render->depsgraph = re->depsgraph;
RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene,
render && get_stroke_count() > 0);