diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:20:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:21:14 +0300 |
commit | 1c24c04e6023f2d2a328dfcdc9f86cd381d029a3 (patch) | |
tree | 7a5af59ce078cb66fb17ec33cf111ffc8d5fb328 /source/blender/gpu/GPU_draw.h | |
parent | 57329304b061efe756e3a4ce1b828e9a7c7f7030 (diff) |
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.
Diffstat (limited to 'source/blender/gpu/GPU_draw.h')
-rw-r--r-- | source/blender/gpu/GPU_draw.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index e437b4e4f58..9bbf46b2a1f 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -46,7 +46,6 @@ struct View3D; struct RegionView3D; struct SmokeModifierData; struct DupliObject; -struct EvaluationContext; #include "DNA_object_enums.h" @@ -79,7 +78,7 @@ void GPU_disable_program_point_size(void); void GPU_begin_object_materials( struct View3D *v3d, struct RegionView3D *rv3d, struct Scene *scene, struct ViewLayer *view_layer, - struct Object *ob, bool glsl, const eObjectMode object_mode, bool *do_alpha_after); + struct Object *ob, bool glsl, bool *do_alpha_after); void GPU_end_object_materials(void); bool GPU_object_materials_check(void); |