[Bf-blender-cvs] [7c59b0b8362] tmp-workbench-rewrite2: Allow passing View3DShading directly to XRAY macros

[Miguel Pozo]

Commit: 7c59b0b83620091291defdbb3f988ba984daf174
Author: Miguel Pozo
Date:   Mon Oct 10 18:06:50 2022 +0200
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rB7c59b0b83620091291defdbb3f988ba984daf174

Allow passing View3DShading directly to XRAY macros

Prevents code duplication by handling View3D.shading and SceneDisplay.shading in the same code path.

===================================================================

M	source/blender/editors/include/ED_view3d.h

===================================================================

diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 7c7b5771a04..0db25025f02 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -1291,13 +1291,21 @@ void ED_scene_draw_fps(const struct Scene *scene, int xoffset, int *yoffset);
 void ED_view3d_stop_render_preview(struct wmWindowManager *wm, struct ARegion *region);
 void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrArea *area);
 
-#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_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))
+#define SHADING_XRAY_ALPHA(shading) \
+  (((shading).type == OB_WIRE) ? (shading).xray_alpha_wire : (shading).xray_alpha)
+#define SHADING_XRAY_FLAG(shading) \
+  (((shading).type == OB_WIRE) ? V3D_SHADING_XRAY_WIREFRAME : V3D_SHADING_XRAY)
+#define SHADING_XRAY_FLAG_ENABLED(shading) (((shading).flag & SHADING_XRAY_FLAG(shading)) != 0)
+#define SHADING_XRAY_ENABLED(shading) \
+  (SHADING_XRAY_FLAG_ENABLED(shading) && (SHADING_XRAY_ALPHA(shading) < 1.0f))
+#define SHADING_XRAY_ACTIVE(shading) \
+  (SHADING_XRAY_ENABLED(shading) && ((shading).type < OB_MATERIAL))
+
+#define XRAY_ALPHA(v3d) SHADING_XRAY_ALPHA((v3d)->shading)
+#define XRAY_FLAG(v3d) SHADING_XRAY_FLAG((v3d)->shading)
+#define XRAY_FLAG_ENABLED(v3d) SHADING_XRAY_FLAG_ENABLED((v3d)->shading)
+#define XRAY_ENABLED(v3d) SHADING_XRAY_ENABLED((v3d)->shading)
+#define XRAY_ACTIVE(v3d) SHADING_XRAY_ACTIVE((v3d)->shading)
 
 /* view3d_draw_legacy.c */