[Bf-blender-cvs] [6f977c5e6d8] soc-2019-openxr: Always do versioning code, even with WITH_OPENXR disabled
Julian Eisel
noreply at git.blender.org
Mon Mar 2 17:13:44 CET 2020
Commit: 6f977c5e6d8db413d30393204ca62452cddad7bd
Author: Julian Eisel
Date: Mon Mar 2 14:41:56 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB6f977c5e6d8db413d30393204ca62452cddad7bd
Always do versioning code, even with WITH_OPENXR disabled
===================================================================
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 6373fe3fab3..a4e621f7099 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4503,20 +4503,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
-
-#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
}
/**
@@ -4530,5 +4516,16 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
*/
{
/* Keep this block, even when empty. */
+ 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;
+ }
+ }
}
}
More information about the Bf-blender-cvs
mailing list