[Bf-blender-cvs] [d92a9a5472a] blender2.8: Use the correct depsgraph for freestyle

Sergey Sharybin noreply at git.blender.org
Thu May 18 16:15:06 CEST 2017


Commit: d92a9a5472a03636ab90e5f21518b57eafed31b0
Author: Sergey Sharybin
Date:   Thu May 18 15:23:59 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBd92a9a5472a03636ab90e5f21518b57eafed31b0

Use the correct depsgraph for freestyle

Freestyle itself is still not working, but that's to be addressed
separately.

===================================================================

M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

===================================================================

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);




More information about the Bf-blender-cvs mailing list