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

Julian Eisel noreply at git.blender.org
Wed Feb 26 21:20:25 CET 2020


Commit: 0f979f33889273a605d011466e34839e52840c13
Author: Julian Eisel
Date:   Wed Feb 26 21:19:35 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB0f979f33889273a605d011466e34839e52840c13

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 0b5c3531adf,627b38a58e8..6373fe3fab3
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4514,19 -4501,18 +4503,32 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
 +
 +#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
    }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+   }
  }



More information about the Bf-blender-cvs mailing list