[Bf-blender-cvs] [1a812145e09] vr_scene_inspection: Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

[Julian Eisel]

Commit: 1a812145e09005fe35c9b9e28e9beb5a5aa68c3f
Author: Julian Eisel
Date:   Fri Jan 24 11:22:04 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB1a812145e09005fe35c9b9e28e9beb5a5aa68c3f

Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 73bb16df9fa,61aeb51a197..9633c0af1cc
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -629,12 -647,11 +647,15 @@@ if(WITH_TBB
    list(APPEND INC_SYS
      ${TBB_INCLUDE_DIRS}
    )
+   list(APPEND LIB
+     ${TBB_LIBRARIES}
+   )
  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")
diff --cc source/blender/blenloader/intern/versioning_280.c
index 5e7a3a794b8,7377f6a62a1..81008fd0831
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4326,18 -4410,11 +4412,25 @@@ void blo_do_versions_280(FileData *fd, 
        br->sub_col[3] = 0.9f;
      }
  
+     /* Pose brush IK segments. */
+     if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "pose_ik_segments")) {
+       for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+         br->pose_ik_segments = 1;
+       }
+     }
++
 +#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
    }
  }