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/overlay/overlay_armature.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/overlay/overlay_armature.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_armature.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 0144fac76ab..960e5e424f2 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -2122,7 +2122,8 @@ static void armature_context_setup(ArmatureDrawContext *ctx,
const float *const_color)
{
const bool is_object_mode = !do_envelope_dist;
- const bool is_xray = (ob->dtx & OB_DRAWXRAY) != 0 || (pd->armature.do_pose_xray && is_pose_mode);
+ const bool is_xray = (ob->dtx & OB_DRAW_IN_FRONT) != 0 ||
+ (pd->armature.do_pose_xray && is_pose_mode);
const bool draw_as_wire = (ob->dt < OB_SOLID);
const bool is_filled = (!pd->armature.transparent && !draw_as_wire) || !is_object_mode;
const bool is_transparent = pd->armature.transparent || (draw_as_wire && !is_object_mode);