From 5732d9e1dcc08d284d7f9f56be22ad901fd53f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 26 Sep 2018 20:31:14 +0200 Subject: Wireframe/Xray: Make Xray option local to wireframe mode This commit make the Xray option for the wireframe different from the other shading mode. This makes it possible to rapidly switch between wireframe + Xray and Solid mode without Xray. Xray alpha is also decoupled. Both variables are duplicated and exposed separately through RNA. --- source/blender/makesdna/DNA_view3d_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_view3d_types.h') diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 5c129b1aa3a..c73def54cc6 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -156,12 +156,12 @@ typedef struct View3DShading { float object_outline_color[3]; float xray_alpha; + float xray_alpha_wire; float cavity_valley_factor; float cavity_ridge_factor; float background_color[3]; - int pad; } View3DShading; @@ -388,6 +388,7 @@ enum { V3D_SHADING_CAVITY = (1 << 5), V3D_SHADING_MATCAP_FLIP_X = (1 << 6), V3D_SHADING_SCENE_WORLD = (1 << 7), + V3D_SHADING_XRAY_WIREFRAME = (1 << 8), }; /* View3DShading->color_type */ -- cgit v1.2.3