[Bf-blender-cvs] [795ae6433dd] xr-controller-support: XR: Change raycast color

[Peter Kim]

Commit: 795ae6433dde6b59c53592795f687a4a7436b41d
Author: Peter Kim
Date:   Wed May 26 17:05:19 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB795ae6433dde6b59c53592795f687a4a7436b41d

XR: Change raycast color

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

M	source/blender/windowmanager/xr/intern/wm_xr_draw.c
M	source/blender/windowmanager/xr/intern/wm_xr_operators.c

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

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.c b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
index df541113069..6605f4eb1da 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
@@ -236,7 +236,7 @@ void wm_xr_draw_controllers(const bContext *UNUSED(C), ARegion *UNUSED(region),
     case XR_CONTROLLER_DRAW_RAY: {
       /* Sphere. */
       {
-        const float color[4] = {0.5f, 0.5f, 0.5f, 0.5f};
+        const float color[4] = {0.422f, 0.438f, 0.446f, 0.4f};
         const float scale = 0.05f;
 
         GPUBatch *sphere = GPU_batch_preset_sphere(2);
@@ -257,7 +257,7 @@ void wm_xr_draw_controllers(const bContext *UNUSED(C), ARegion *UNUSED(region),
 
       /* Ray. */
       {
-        const float color[4] = {0.863f, 0.0f, 0.545f, 0.5f};
+        const float color[4] = {0.35f, 0.35f, 1.0f, 0.5f};
         const float scale = settings->clip_end;
         float ray[3];
 
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.c b/source/blender/windowmanager/xr/intern/wm_xr_operators.c
index 757b953e170..b9cd8b2f974 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_operators.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.c
@@ -181,7 +181,7 @@ static void wm_xr_select_raycast_draw(const bContext *UNUSED(C),
   GPUVertFormat *format = immVertexFormat();
   uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
   immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
-  immUniformColor4f(0.863f, 0.0f, 0.545f, 1.0f);
+  immUniformColor4f(0.35f, 0.35f, 1.0f, 1.0f);
 
   GPU_depth_test(GPU_DEPTH_LESS_EQUAL);
   GPU_line_width(3.0f);