diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 14:59:09 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 15:00:06 +0300 |
| commit | 63bb2007d88b88824094447a745fa21d5fb2f61b (patch) | |
| tree | 54af8d34a0b0ab41ddcac69b3d22d00d80305b5d /source/blender/draw/engines/workbench/workbench_private.h | |
| parent | f0808b53abf2f208da5f20ad33637dc60bcf43d1 (diff) | |
CodeCleanup: Added View3DShading enums
Added the core enums that workbench draw engine uses.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_private.h')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_private.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index faf85e4a7de..bb93864966e 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -285,7 +285,7 @@ typedef struct WORKBENCH_EffectInfo { typedef struct WORKBENCH_MaterialData { float base_color[3], metallic; float roughness, alpha; - int color_type; + eV3DShadingColorType color_type; int interp; Image *ima; ImageUser *iuser; @@ -452,13 +452,14 @@ void workbench_forward_cache_finish(WORKBENCH_Data *vedata); /* For OIT in deferred */ void workbench_forward_outline_shaders_ensure(WORKBENCH_PrivateData *wpd, eGPUShaderConfig sh_cfg); void workbench_forward_choose_shaders(WORKBENCH_PrivateData *wpd, eGPUShaderConfig sh_cfg); -WORKBENCH_MaterialData *workbench_forward_get_or_create_material_data(WORKBENCH_Data *vedata, - Object *ob, - Material *mat, - Image *ima, - ImageUser *iuser, - int color_type, - int interp); +WORKBENCH_MaterialData *workbench_forward_get_or_create_material_data( + WORKBENCH_Data *vedata, + Object *ob, + Material *mat, + Image *ima, + ImageUser *iuser, + eV3DShadingColorType color_type, + int interp); /* workbench_effect_aa.c */ void workbench_aa_create_pass(WORKBENCH_Data *vedata, GPUTexture **tx); @@ -488,10 +489,10 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata, void workbench_dof_draw_pass(WORKBENCH_Data *vedata); /* workbench_materials.c */ -int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, - Image *ima, - Object *ob, - bool use_sculpt_pbvh); +eV3DShadingColorType workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, + Image *ima, + Object *ob, + bool use_sculpt_pbvh); void workbench_material_get_image_and_mat( Object *ob, int mat_nr, Image **r_image, ImageUser **r_iuser, int *r_interp, Material **r_mat); char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, |