diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-23 05:46:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-23 05:48:21 +0300 |
| commit | d56c0a0a6affcdfd7335c5fce1892a82f23bdf37 (patch) | |
| tree | 62149f583492ef6a9c4ee4aebe3da1cfb830ffaa /source/blender/draw | |
| parent | 3fdcd2293eadc277bc02297d4688a66f0456613b (diff) | |
Cleanup: rename bone-select to xray
This shows bones in font and uses the xray toggle binding.
Also 'bone select' isn't very meaningful on it's own.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/pose_mode.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 40b6a4e5b2b..c8b70953f87 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1508,7 +1508,7 @@ void DRW_gpencil_populate_datablock( if ((draw_ctx->obact) && (draw_ctx->object_mode == OB_MODE_POSE) && (v3d->overlay.flag & V3D_OVERLAY_BONE_SELECT)) { - opacity = opacity * v3d->overlay.bone_select_alpha; + opacity = opacity * v3d->overlay.xray_alpha_bone; } /* fade no active layers */ if ((overlay) && (draw_ctx->object_mode == OB_MODE_GPENCIL_PAINT) && diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 9bf3ce15166..faba85c9b46 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -592,7 +592,7 @@ typedef struct DRWContextState { const DRWContextState *DRW_context_state_get(void); #define XRAY_ALPHA(v3d) (((v3d)->shading.type == OB_WIRE) ? (v3d)->shading.xray_alpha_wire : (v3d)->shading.xray_alpha) -#define XRAY_FLAG(v3d) (((v3d)->shading.type == OB_WIRE) ? V3D_SHADING_XRAY_WIREFRAME : V3D_SHADING_XRAY) +#define XRAY_FLAG(v3d) (((v3d)->shading.type == OB_WIRE) ? V3D_SHADING_XRAY_BONE : V3D_SHADING_XRAY) #define XRAY_ENABLED(v3d) ((((v3d)->shading.flag & XRAY_FLAG(v3d)) != 0) && (XRAY_ALPHA(v3d) < 1.0f)) #endif /* __DRW_RENDER_H__ */ diff --git a/source/blender/draw/modes/pose_mode.c b/source/blender/draw/modes/pose_mode.c index 81466f19128..3c0a8048c9e 100644 --- a/source/blender/draw/modes/pose_mode.c +++ b/source/blender/draw/modes/pose_mode.c @@ -147,7 +147,7 @@ static void POSE_cache_init(void *vedata) { if (POSE_is_bone_selection_overlay_active()) { - const float alpha = (draw_ctx->object_mode & OB_MODE_WEIGHT_PAINT) ? 0.0f : v3d->overlay.bone_select_alpha; + const float alpha = (draw_ctx->object_mode & OB_MODE_WEIGHT_PAINT) ? 0.0f : v3d->overlay.xray_alpha_bone; copy_v4_fl4(ppd->blend_color, 0.0f, 0.0f, 0.0f, alpha); copy_v4_fl4(ppd->blend_color_invert, 0.0f, 0.0f, 0.0f, pow(alpha, 4)); DRWShadingGroup *grp; |