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:
authorClément Foucault <foucault.clem@gmail.com>2020-07-21 13:53:30 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-07-21 15:44:37 +0300
commit727e569ac3f2d7965f0054da1db56c6fa99475c2 (patch)
tree6deb322a3166e0b27266e5597c0d727e8d440b8e /source/blender/draw/engines/workbench/workbench_materials.c
parent3fe5c0e5df8191053148b4605c476b555795ee16 (diff)
Cleanup: CodeQuality: Replace OB_DRAWXRAY by OB_DRAW_IN_FRONT
This is to match the option name and to avoid confusion with workbench xray mode.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_materials.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index e04063c4487..3fa2e7ef084 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -168,7 +168,7 @@ DRWShadingGroup *workbench_material_setup_ex(WORKBENCH_PrivateData *wpd,
Image *ima = NULL;
ImageUser *iuser = NULL;
eGPUSamplerState sampler;
- const bool infront = (ob->dtx & OB_DRAWXRAY) != 0;
+ const bool infront = (ob->dtx & OB_DRAW_IN_FRONT) != 0;
if (color_type == V3D_SHADING_TEXTURE_COLOR) {
workbench_material_get_image(ob, mat_nr, &ima, &iuser, &sampler);
@@ -273,7 +273,7 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd,
tex = wpd->dummy_image_tx;
}
- const bool infront = (ob->dtx & OB_DRAWXRAY) != 0;
+ const bool infront = (ob->dtx & OB_DRAW_IN_FRONT) != 0;
const bool transp = wpd->shading.xray_alpha < 1.0f;
WORKBENCH_Prepass *prepass = &wpd->prepass[transp][infront][datatype];