[Bf-blender-cvs] [03b09dbe320] soc-2019-openxr: Fix compile error after merge and warning

Julian Eisel noreply at git.blender.org
Thu Aug 1 21:55:39 CEST 2019


Commit: 03b09dbe3208294a1efbb3762c1496cd399bab2b
Author: Julian Eisel
Date:   Thu Aug 1 21:53:57 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB03b09dbe3208294a1efbb3762c1496cd399bab2b

Fix compile error after merge and warning

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

M	source/blender/windowmanager/intern/wm_xr.c

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

diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 4f7d2430ba9..22e6fb7b3bf 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -164,7 +164,8 @@ static void wm_xr_session_free_data(wmSurface *surface)
   g_xr_surface = NULL;
 }
 
-static wmSurface *wm_xr_session_surface_create(wmWindowManager *wm, unsigned int gpu_binding_type)
+static wmSurface *wm_xr_session_surface_create(wmWindowManager *UNUSED(wm),
+                                               unsigned int gpu_binding_type)
 {
   if (g_xr_surface) {
     BLI_assert(false);
@@ -308,7 +309,7 @@ static GHOST_ContextHandle wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view
   BKE_screen_view3d_shading_init(&shading);
   shading.flag |= V3D_SHADING_WORLD_ORIENTATION;
   shading.background_type = V3D_SHADING_BACKGROUND_WORLD;
-  ED_view3d_draw_offscreen_simple(CTX_data_depsgraph(C),
+  ED_view3d_draw_offscreen_simple(CTX_data_ensure_evaluated_depsgraph(C),
                                   CTX_data_scene(C),
                                   &shading,
                                   OB_SOLID,



More information about the Bf-blender-cvs mailing list