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

1 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index c394060dfba..9cc4cb692e3 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -78,7 +78,6 @@ typedef struct ViewContext {
 	struct Depsgraph *depsgraph;
 	struct Scene *scene;
 	struct ViewLayer *view_layer;
-	struct RenderEngineType *engine_type;
 	struct Object *obact;
 	struct Object *obedit;
 	struct ARegion *ar;
@@ -380,14 +379,16 @@ void                    ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, s
 
 void  ED_draw_object_facemap(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, const float col[4], const int facemap);
 
+struct RenderEngineType *ED_view3d_engine_type(struct Scene *scene, int drawtype);
+
 bool ED_view3d_context_activate(struct bContext *C);
 void ED_view3d_draw_offscreen_init(
         struct Depsgraph *depsgraph, struct Scene *scene,
-        struct ViewLayer *view_layer, struct RenderEngineType *engine_type,
-        struct View3D *v3d);
+        struct ViewLayer *view_layer, struct View3D *v3d,
+        int drawtype);
 void ED_view3d_draw_offscreen(
         struct Depsgraph *depsgraph, struct Scene *scene,
-        struct ViewLayer *view_layer, struct RenderEngineType *engine_type,
+        struct ViewLayer *view_layer, int drawtype,
         struct View3D *v3d, struct ARegion *ar, int winx, int winy, float viewmat[4][4],
         float winmat[4][4], bool do_bgpic, bool do_sky, bool is_persp, const char *viewname,
         struct GPUFXSettings *fx_settings,
@@ -410,16 +411,16 @@ enum {
 
 struct ImBuf *ED_view3d_draw_offscreen_imbuf(
         struct Depsgraph *depsgraph, struct Scene *scene,
-        struct ViewLayer *view_layer, struct RenderEngineType *engine_type,
+        struct ViewLayer *view_layer, int drawtype,
         struct View3D *v3d, struct ARegion *ar,
         int sizex, int sizey, unsigned int flag, unsigned int draw_flags,
         int alpha_mode, int samples, const char *viewname,
         struct GPUOffScreen *ofs, char err_out[256]);
 struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
         struct Depsgraph *depsgraph, struct Scene *scene,
-        struct ViewLayer *view_layer, struct RenderEngineType *engine_type,
+        struct ViewLayer *view_layer, int drawtype,
         struct Object *camera, int width, int height,
-        unsigned int flag, unsigned int draw_flags, int drawtype, int alpha_mode,
+        unsigned int flag, unsigned int draw_flags, int alpha_mode,
         int samples, const char *viewname,
         struct GPUOffScreen *ofs, char err_out[256]);