[Bf-blender-cvs] [fe1f7c038de] vr_scene_inspection: Merge branch 'soc-2019-openxr' into vr_scene_inspection

Julian Eisel noreply at git.blender.org
Mon Feb 17 17:07:20 CET 2020


Commit: fe1f7c038dee9d977fb1bcc8142ff86db814ea3d
Author: Julian Eisel
Date:   Mon Feb 17 17:06:26 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBfe1f7c038dee9d977fb1bcc8142ff86db814ea3d

Merge branch 'soc-2019-openxr' into vr_scene_inspection

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



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

diff --cc source/blender/windowmanager/intern/wm_xr.c
index 7237aa08fb0,b1a038a48c3..19ec92de26d
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@@ -608,14 -429,19 +570,14 @@@ void wm_xr_draw_view(const GHOST_XrDraw
  
    offscreen = surface_data->offscreen;
    viewport = surface_data->viewport;
-   wm_xr_surface_viewport_bind(surface_data, &rect);
    glClear(GL_DEPTH_BUFFER_BIT);
+   /* In case a framebuffer is still bound from drawing the last eye. */
    GPU_framebuffer_restore();
  
 -  BKE_screen_view3d_shading_init(&shading);
 -  shading.flag |= V3D_SHADING_WORLD_ORIENTATION;
 -  shading.flag &= ~V3D_SHADING_SPECULAR_HIGHLIGHT;
 -  shading.background_type = V3D_SHADING_BACKGROUND_WORLD;
 -
    ED_view3d_draw_offscreen_simple(CTX_data_ensure_evaluated_depsgraph(C),
 -                                  CTX_data_scene(C),
 -                                  &shading,
 -                                  wm->xr.session_settings.shading_type,
 +                                  scene,
 +                                  &wm->xr.session_settings.shading,
 +                                  wm->xr.session_settings.shading.type,
                                    draw_view->width,
                                    draw_view->height,
                                    display_flags,



More information about the Bf-blender-cvs mailing list