[Bf-blender-cvs] [97c929a88f0] vr_scene_inspection: Always read/write XR data, even with WITH_XR_OPENXR disabled

[Julian Eisel]

Commit: 97c929a88f062d2d3aa458a4f99df6ef2c286a9c
Author: Julian Eisel
Date:   Mon Mar 16 18:18:54 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB97c929a88f062d2d3aa458a4f99df6ef2c286a9c

Always read/write XR data, even with WITH_XR_OPENXR disabled

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

M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c

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

diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 3963ddc179a..450d3fc2371 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -92,10 +92,6 @@ if(WITH_ALEMBIC)
   add_definitions(-DWITH_ALEMBIC)
 endif()
 
-if(WITH_XR_OPENXR)
-  add_definitions(-DWITH_XR_OPENXR)
-endif()
-
 blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # needed so writefile.c can use dna_type_offsets.h
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5a5de960835..017bacb9177 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7650,9 +7650,7 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
     }
   }
 
-#ifdef WITH_XR_OPENXR
   direct_link_wm_xr_data(fd, &wm->xr);
-#endif
 
   BLI_listbase_clear(&wm->timers);
   BLI_listbase_clear(&wm->operators);
@@ -7694,9 +7692,7 @@ static void lib_link_windowmanager(FileData *fd, Main *UNUSED(bmain), wmWindowMa
       lib_link_area(fd, &wm->id, area);
     }
 
-#ifdef WITH_XR_OPENXR
     lib_link_wm_xr_data(fd, &wm->id, &wm->xr);
-#endif
   }
 }
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index bf223fb1280..a1e6b38b9f3 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2805,12 +2805,10 @@ static void write_gpencil(WriteData *wd, bGPdata *gpd)
   }
 }
 
-#ifdef WITH_XR_OPENXR
 static void write_wm_xr_data(WriteData *wd, wmXrData *xr_data)
 {
   write_view3dshading(wd, &xr_data->session_settings.shading);
 }
-#endif
 
 static void write_region(WriteData *wd, ARegion *region, int spacetype)
 {
@@ -3058,9 +3056,7 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
 {
   writestruct(wd, ID_WM, wmWindowManager, 1, wm);
   write_iddata(wd, &wm->id);
-#ifdef WITH_XR_OPENXR
   write_wm_xr_data(wd, &wm->xr);
-#endif
 
   for (wmWindow *win = wm->windows.first; win; win = win->next) {
 #ifndef WITH_GLOBAL_AREA_WRITING