[Bf-blender-cvs] [b86be9b2145] soc-2019-openxr: Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

[Julian Eisel]

Commit: b86be9b2145458037fd0b17433b7af0efa7b6472
Author: Julian Eisel
Date:   Thu Mar 12 15:58:03 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBb86be9b2145458037fd0b17433b7af0efa7b6472

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 34041b0ca22,d0659bfd34c..0ce32d234a8
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4851,16 -4849,16 +4851,28 @@@ void blo_do_versions_280(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
+ 
+     if (!DNA_struct_elem_find(fd->filesdna, "OceanModifierData", "float", "fetch_jonswap")) {
+       for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+         for (ModifierData *md = object->modifiers.first; md; md = md->next) {
+           if (md->type == eModifierType_Ocean) {
+             OceanModifierData *omd = (OceanModifierData *)md;
+             omd->fetch_jonswap = 120.0f;
+           }
+         }
+       }
+     }
++
 +    if (!DNA_struct_find(fd->filesdna, "XrSessionSettings")) {
 +      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;
 +      }
 +    }
    }
  }