[Bf-blender-cvs] [f07cd66ca1c] vr_scene_inspection: Fix incorrect versioning code after merge conflicts

[Julian Eisel]

Commit: f07cd66ca1c0a26a15583a6894a7e50c27cf7007
Author: Julian Eisel
Date:   Wed Mar 11 01:25:16 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBf07cd66ca1c0a26a15583a6894a7e50c27cf7007

Fix incorrect versioning code after merge conflicts

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 32577e1f6a8..6f6a8fa5274 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4870,11 +4870,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
       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;
+        BKE_screen_view3d_shading_init(&wm->xr.session_settings.shading);
         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;
+
+        wm->xr.session_settings.flag = XR_SESSION_USE_POSITION_TRACKING;
       }
     }
   }