Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix build error due to conflicting types

Browse Source
This commit is contained in:
Peter Kim
2021-10-12 16:36:56 +09:00
parent 9dda65455b
commit e8dc02aa3f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -1758,7 +1758,7 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph, void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
Scene *scene, Scene *scene,
View3DShading *shading_override, View3DShading *shading_override,
int drawtype, eDrawType drawtype,
int winx, int winx,
int winy, int winy,
uint draw_flags, uint draw_flags,

2
source/blender/windowmanager/xr/intern/wm_xr_draw.c
View File

@@ -150,7 +150,7 @@ void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata)
ED_view3d_draw_offscreen_simple(draw_data->depsgraph, ED_view3d_draw_offscreen_simple(draw_data->depsgraph,
draw_data->scene, draw_data->scene,
&settings->shading, &settings->shading,
settings->shading.type, (eDrawType)settings->shading.type,
draw_view->width, draw_view->width,
draw_view->height, draw_view->height,
display_flags, display_flags,