diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-31 02:45:41 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-09-13 18:32:18 +0300 |
| commit | ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce (patch) | |
| tree | f8cc84f7e2038f2a81ac0141d79205f1df649e4e /source/blender/draw/engines/workbench/workbench_private.h | |
| parent | f7e8b580989ec70d1cf8f15a11d4f09e6b36f407 (diff) | |
DRW: Refactor to support draw call batching
Reviewers: brecht
Differential Revision: D4997
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_private.h')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_private.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index d880d5d58b5..f51da581827 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -281,13 +281,8 @@ typedef struct WORKBENCH_EffectInfo { } WORKBENCH_EffectInfo; typedef struct WORKBENCH_MaterialData { - float base_color[3]; - float diffuse_color[3]; - float specular_color[3]; - float alpha; - float metallic; - float roughness; - int object_id; + float base_color[3], metallic; + float roughness, alpha; int color_type; int interp; Image *ima; @@ -308,8 +303,6 @@ typedef struct WORKBENCH_ObjectData { float shadow_min[3], shadow_max[3]; BoundBox shadow_bbox; bool shadow_bbox_dirty; - - int object_id; } WORKBENCH_ObjectData; /* inline helper functions */ @@ -500,7 +493,6 @@ void workbench_material_shgroup_uniform(WORKBENCH_PrivateData *wpd, DRWShadingGroup *grp, WORKBENCH_MaterialData *material, Object *ob, - const bool use_metallic, const bool deferred, const int interp); void workbench_material_copy(WORKBENCH_MaterialData *dest_material, |