From 1c24c04e6023f2d2a328dfcdc9f86cd381d029a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Apr 2018 18:20:27 +0200 Subject: Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details. --- source/blender/draw/DRW_engine.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/draw/DRW_engine.h') diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index e42b5a49d64..cf76bfdeef5 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -101,26 +101,26 @@ void DRW_draw_view(const struct bContext *C); void DRW_draw_render_loop_ex( struct Depsgraph *depsgraph, struct RenderEngineType *engine_type, - struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode, + struct ARegion *ar, struct View3D *v3d, const struct bContext *evil_C); void DRW_draw_render_loop( struct Depsgraph *depsgraph, - struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode); + struct ARegion *ar, struct View3D *v3d); void DRW_draw_render_loop_offscreen( struct Depsgraph *depsgraph, struct RenderEngineType *engine_type, - struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode, + struct ARegion *ar, struct View3D *v3d, const bool draw_background, struct GPUOffScreen *ofs, struct GPUViewport *viewport); void DRW_draw_select_loop( struct Depsgraph *depsgraph, - struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode, + struct ARegion *ar, struct View3D *v3d, bool use_obedit_skip, bool use_nearest, const struct rcti *rect, DRW_SelectPassFn select_pass_fn, void *select_pass_user_data); void DRW_draw_depth_loop( struct Depsgraph *depsgraph, - struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode); + struct ARegion *ar, struct View3D *v3d); /* This is here because GPUViewport needs it */ void DRW_pass_free(struct DRWPass *pass); -- cgit v1.2.3