[Bf-blender-cvs] [e8dc02aa3f2] master: Fix build error due to conflicting types

[Peter Kim]

Commit: e8dc02aa3f219db634a2359619b6581a3879792d
Author: Peter Kim
Date:   Tue Oct 12 16:36:56 2021 +0900
Branches: master
https://developer.blender.org/rBe8dc02aa3f219db634a2359619b6581a3879792d

Fix build error due to conflicting types

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

M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/windowmanager/xr/intern/wm_xr_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 4da24888e1d..151fa02cd5c 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1758,7 +1758,7 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
 void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
                                      Scene *scene,
                                      View3DShading *shading_override,
-                                     int drawtype,
+                                     eDrawType drawtype,
                                      int winx,
                                      int winy,
                                      uint draw_flags,
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.c b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
index 6b3756c8178..628d50f05bd 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
@@ -150,7 +150,7 @@ void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata)
   ED_view3d_draw_offscreen_simple(draw_data->depsgraph,
                                   draw_data->scene,
                                   &settings->shading,
-                                  settings->shading.type,
+                                  (eDrawType)settings->shading.type,
                                   draw_view->width,
                                   draw_view->height,
                                   display_flags,