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

[Julian Eisel]

Commit: 3b1e67754c208fe15c64ba113c8d01e1f7f99adf
Author: Julian Eisel
Date:   Mon Feb 17 12:33:56 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB3b1e67754c208fe15c64ba113c8d01e1f7f99adf

Merge branch 'soc-2019-openxr' into vr_scene_inspection

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 9207a42e0e2,e3c9a0ee213..03e735a2944
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -7918,31 -7612,19 +7639,23 @@@ static void direct_link_windowmanager(F
    wm->is_interface_locked = 0;
  }
  
- static void lib_link_windowmanager(FileData *fd, Main *main)
+ static void lib_link_windowmanager(FileData *fd, Main *UNUSED(bmain), wmWindowManager *wm)
  {
-   wmWindowManager *wm;
-   wmWindow *win;
- 
-   for (wm = main->wm.first; wm; wm = wm->id.next) {
-     if (wm->id.tag & LIB_TAG_NEED_LINK) {
-       /* Note: WM IDProperties are never written to file, hence no need to read/link them here. */
-       for (win = wm->windows.first; win; win = win->next) {
-         if (win->workspace_hook) { /* NULL for old files */
-           lib_link_workspace_instance_hook(fd, win->workspace_hook, &wm->id);
-         }
-         win->scene = newlibadr(fd, wm->id.lib, win->scene);
-         /* deprecated, but needed for versioning (will be NULL'ed then) */
-         win->screen = newlibadr(fd, NULL, win->screen);
- 
-         for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) {
-           lib_link_area(fd, &wm->id, area);
-         }
-       }
- 
-       lib_link_wm_xr_data(fd, &wm->id, &wm->xr);
+   for (wmWindow *win = wm->windows.first; win; win = win->next) {
+     if (win->workspace_hook) { /* NULL for old files */
+       lib_link_workspace_instance_hook(fd, win->workspace_hook, &wm->id);
+     }
+     win->scene = newlibadr(fd, wm->id.lib, win->scene);
+     /* deprecated, but needed for versioning (will be NULL'ed then) */
+     win->screen = newlibadr(fd, NULL, win->screen);
  
-       wm->id.tag &= ~LIB_TAG_NEED_LINK;
+     for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) {
+       lib_link_area(fd, &wm->id, area);
      }
++
++#ifdef WITH_OPENXR
++    lib_link_wm_xr_data(fd, &wm->id, &wm->xr);
++#endif
    }
  }
  
diff --cc source/blender/windowmanager/intern/wm_xr.c
index 899ebfd0626,69df585fca5..7237aa08fb0
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@@ -612,11 -469,16 +610,12 @@@ void wm_xr_draw_view(const GHOST_XrDraw
    viewport = surface_data->viewport;
    wm_xr_surface_viewport_bind(surface_data, &rect);
    glClear(GL_DEPTH_BUFFER_BIT);
+   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,