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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-05-18 16:23:59 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-18 17:14:32 +0300
commitd92a9a5472a03636ab90e5f21518b57eafed31b0 (patch)
tree103248a4018fa6010a7d6ed2033bc3b00f4221d1 /source/blender/freestyle
parent7490b24241ff3c508de37581174d38a468158e1f (diff)
Use the correct depsgraph for freestyle
Freestyle itself is still not working, but that's to be addressed separately.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index c1e9a50c860..b89ff75e199 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,7 +960,8 @@ Render *BlenderStrokeRenderer::RenderScene(Render *re, bool render)
#endif
Render *freestyle_render = RE_NewRender(freestyle_scene->id.name);
- freestyle_render->depsgraph = re->depsgraph;
+ DEG_scene_relations_update(freestyle_bmain, freestyle_scene);
+ freestyle_render->depsgraph = freestyle_scene->depsgraph;
RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene,
render && get_stroke_count() > 0);