blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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
This commit is contained in:
Dalai Felinto 2017-05-18 14:47:44 +02:00
parent 00164f3c70
commit c55c2dbfba
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/render/render_internal.c
View File

@ -307,6 +307,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
}
re = RE_NewRender(scene->id.name);
RE_SetDepsgraph(re, CTX_data_depsgraph(C));
lay_override = (v3d && v3d->lay != scene->lay) ? v3d->lay : 0;
G.is_break = false;

3
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

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