diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-06-13 10:33:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-13 10:33:51 +0300 |
| commit | d63438e4d167149e9aa2ed958e979ea0fc534793 (patch) | |
| tree | aab53aa43dfad5b63e2320858c49a17902ec2f38 /source/blender/editors | |
| parent | 41acdac2de5813c4d6b75e12581903134a0fd078 (diff) | |
Cleanup: correct wireframe xray flag name
Revert part of d56c0a0a6affcdfd7335c
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/ED_view3d.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 5ce9133a531..751f71cc53b 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -701,7 +701,7 @@ void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrAr #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_BONE : V3D_SHADING_XRAY) + (((v3d)->shading.type == OB_WIRE) ? V3D_SHADING_XRAY_WIREFRAME : V3D_SHADING_XRAY) #define XRAY_FLAG_ENABLED(v3d) (((v3d)->shading.flag & XRAY_FLAG(v3d)) != 0) #define XRAY_ENABLED(v3d) (XRAY_FLAG_ENABLED(v3d) && (XRAY_ALPHA(v3d) < 1.0f)) #define XRAY_ACTIVE(v3d) (XRAY_ENABLED(v3d) && ((v3d)->shading.type < OB_MATERIAL)) diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 1ee572211c0..6e12091cf75 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -5204,7 +5204,7 @@ static int toggle_xray_exec(bContext *C, wmOperator *op) ELEM(v3d->shading.type, OB_WIRE, OB_SOLID)); if (v3d->shading.type == OB_WIRE) { - v3d->shading.flag ^= V3D_SHADING_XRAY_BONE; + v3d->shading.flag ^= V3D_SHADING_XRAY_WIREFRAME; } else { v3d->shading.flag ^= V3D_SHADING_XRAY; |