diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-17 14:35:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-18 17:35:38 +0300 |
| commit | f9cf2e2f6cc779764f46dae7ceadc4bb2e9ddcb5 (patch) | |
| tree | 0f409fce181813cab818bfb83a33779e38774684 /source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | |
| parent | 15850a8740ed95afdc5779e224bf40f7540a7d62 (diff) | |
Workspaces: remove workspace engine, use 3D viewport draw mode instead.
ViewRender was removed, which means we can't get the render engine for files
saved in 2.8. We assume that any files saved in 2.8 were intended to use Eevee
and set the engine to that.
A fix included with this is that .blend thumbails now draw with Clay mode,
and never Eevee or Cycles. These were drawn with solid mode in 2.7, and should
be very fast and not e.g. load heavy image textures.
Differential Revision: https://developer.blender.org/D3156
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index b5f6784bdc4..2de1050e167 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -116,9 +116,9 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str freestyle_scene->r.filtertype = old_scene->r.filtertype; freestyle_scene->r.gauss = old_scene->r.gauss; freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity; - BKE_viewrender_copy(&freestyle_scene->view_render, &old_scene->view_render); + STRNCPY(freestyle_scene->r.engine, old_scene->r.engine); if (G.debug & G_DEBUG_FREESTYLE) { - cout << "Stroke rendering engine : " << freestyle_scene->view_render.engine_id << endl; + cout << "Stroke rendering engine : " << freestyle_scene->r.engine << endl; } freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; @@ -128,7 +128,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str freestyle_scene->id.properties = IDP_CopyProperty_ex(old_scene->id.properties, 0); } - if (STREQ(freestyle_scene->view_render.engine_id, RE_engine_id_CYCLES)) { + if (STREQ(freestyle_scene->r.engine, RE_engine_id_CYCLES)) { /* Render with transparent background. */ PointerRNA freestyle_scene_ptr; RNA_id_pointer_create(&freestyle_scene->id, &freestyle_scene_ptr); |