[Bf-blender-cvs] [88f234e27f4] soc-2019-openxr: Merge branch 'master' into soc-2019-openxr

[Julian Eisel]

Commit: 88f234e27f440df15bb1108bb865bbb5d2965b62
Author: Julian Eisel
Date:   Tue Nov 5 10:30:22 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB88f234e27f440df15bb1108bb865bbb5d2965b62

Merge branch 'master' into soc-2019-openxr

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 0cf5aab6bc4,023980292fa..4574b70e4f0
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -646,14 -646,10 +646,14 @@@ if(WITH_TBB
    )
  endif()
  
 +if(WITH_OPENXR)
 +  add_definitions(-DWITH_OPENXR)
 +endif()
 +
- ## Warnings as errors, this is too strict!
- #if(MSVC)
- #   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- #endif()
+ # # Warnings as errors, this is too strict!
+ # if(MSVC)
+ #    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+ # endif()
  
  blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
  
diff --cc source/blender/blenloader/intern/versioning_280.c
index 9d2f7232949,50363e3f42a..90f4268940f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3934,18 -3932,10 +3934,24 @@@ void blo_do_versions_280(FileData *fd, 
  
    {
      /* Versioning code until next subversion bump goes here. */
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+         sa->flag &= ~AREA_FLAG_UNUSED_6;
+       }
+     }
++
 +#ifdef WITH_OPENXR
 +    if (!DNA_struct_find(fd->filesdna, "bXrSessionSettings")) {
 +      for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) {
 +        const View3D *v3d_default = DNA_struct_default_get(View3D);
 +
 +        wm->xr.session_settings.shading_type = OB_SOLID;
 +        wm->xr.session_settings.draw_flags = (V3D_OFSDRAW_SHOW_GRIDFLOOR |
 +                                              V3D_OFSDRAW_SHOW_ANNOTATION);
 +        wm->xr.session_settings.clip_start = v3d_default->clip_start;
 +        wm->xr.session_settings.clip_end = v3d_default->clip_end;
 +      }
 +    }
 +#endif
    }
  }
diff --cc source/blender/windowmanager/CMakeLists.txt
index 08bcde2459a,12ab2f20ba1..fe6fd9596c8
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@@ -100,8 -99,9 +100,10 @@@ set(SR
    wm_event_system.h
    wm_event_types.h
    wm_files.h
 +  wm_surface.h
    wm_window.h
+   intern/wm_platform_support.h
+   intern/wm_window_private.h
    gizmo/WM_gizmo_api.h
    gizmo/WM_gizmo_types.h
    gizmo/wm_gizmo_fn.h