Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-03-06 14:59:09 +0300
committerJeroen Bakker <jeroen@blender.org>2020-03-06 15:00:06 +0300
commit63bb2007d88b88824094447a745fa21d5fb2f61b (patch)
tree54af8d34a0b0ab41ddcac69b3d22d00d80305b5d /source/blender/draw/engines/workbench/workbench_materials.c
parentf0808b53abf2f208da5f20ad33637dc60bcf43d1 (diff)
CodeCleanup: Added View3DShading enums
Added the core enums that workbench draw engine uses.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_materials.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index 7adc74aab2d..5f1e3461d9f 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -292,12 +292,12 @@ int workbench_material_get_accum_shader_index(WORKBENCH_PrivateData *wpd,
return index;
}
-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)
{
- int color_type = wpd->shading.color_type;
+ eV3DShadingColorType color_type = wpd->shading.color_type;
const Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL;
if ((color_type == V3D_SHADING_TEXTURE_COLOR) &&