Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPeter Kim <pk15950@gmail.com>2021-10-12 10:36:56 +0300
committerPeter Kim <pk15950@gmail.com>2021-10-12 10:36:56 +0300
commite8dc02aa3f219db634a2359619b6581a3879792d (patch)
tree4e2d5274c3fcb2ab0b8f664e512eab5035b07b21 /source
parent9dda65455b54336fe3efef91eba9e41866dac1c1 (diff)
Fix build error due to conflicting types
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
-rw-r--r--source/blender/windowmanager/xr/intern/wm_xr_draw.c2
2 files changed, 2 insertions, 2 deletions
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,