[Bf-blender-cvs] [247c691d69c] vr_scene_inspection: Add XR_ prefix like now in master
Julian Eisel
noreply at git.blender.org
Thu Mar 5 12:47:29 CET 2020
Commit: 247c691d69c4042dde4b4e7ed4f845a8c59d66b9
Author: Julian Eisel
Date: Thu Mar 5 12:46:21 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB247c691d69c4042dde4b4e7ed4f845a8c59d66b9
Add XR_ prefix like now in master
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 60186b17ce2..b13b5a911ed 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7521,7 +7521,7 @@ static bool direct_link_area_map(FileData *fd, ScrAreaMap *area_map)
/** \name XR-data
* \{ */
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
static void direct_link_wm_xr_data(FileData *fd, wmXrData *xr_data)
{
@@ -7591,7 +7591,7 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
}
}
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
direct_link_wm_xr_data(fd, &wm->xr);
#endif
@@ -7636,7 +7636,7 @@ static void lib_link_windowmanager(FileData *fd, Main *UNUSED(bmain), wmWindowMa
lib_link_area(fd, &wm->id, area);
}
-#ifdef WITH_OPENXR
+#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 3cd337e228a..f90f7c55a3c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2723,7 +2723,7 @@ static void write_gpencil(WriteData *wd, bGPdata *gpd)
}
}
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
static void write_wm_xr_data(WriteData *wd, wmXrData *xr_data)
{
write_view3dshading(wd, &xr_data->session_settings.shading);
@@ -2976,7 +2976,7 @@ static void write_windowmanager(WriteData *wd, wmWindowManager *wm)
{
writestruct(wd, ID_WM, wmWindowManager, 1, wm);
write_iddata(wd, &wm->id);
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
write_wm_xr_data(wd, &wm->xr);
#endif
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 382c4d25d8c..c7fe82e0cbb 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -94,8 +94,8 @@ if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)
endif()
-if(WITH_OPENXR)
- add_definitions(-DWITH_OPENXR)
+if(WITH_XR_OPENXR)
+ add_definitions(-DWITH_XR_OPENXR)
endif()
blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 555e52306e1..a02f66bec5a 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -700,7 +700,7 @@ static void view3d_main_region_listener(
if (ELEM(wmn->data, ND_UNDO)) {
WM_gizmomap_tag_refresh(gzmap);
}
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
else if (ELEM(wmn->data, ND_XR_DATA_CHANGED)) {
/* Only cause a redraw if this a VR session mirror. Should more features be added that
* require redraws, we could pass something to wmn->reference, e.g. the flag value. */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 23e2dc23d17..9ab7e44e2b8 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -313,7 +313,7 @@ static void view3d_stereo3d_setup(
}
}
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
static bool view3d_xr_mirror_active(const wmWindowManager *wm,
const View3D *v3d,
const ARegion *ar)
@@ -351,7 +351,7 @@ static void view3d_xr_mirror_setup(const wmWindowManager *wm,
/* Reset overridden View3D data */
v3d->lens = lens_old;
}
-#endif /* WITH_OPENXR */
+#endif /* WITH_XR_OPENXR */
/**
* Set the correct matrices
@@ -368,7 +368,7 @@ void ED_view3d_draw_setup_view(const wmWindowManager *wm,
{
RegionView3D *rv3d = ar->regiondata;
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
/* Setup the view matrix. */
if (view3d_xr_mirror_active(wm, v3d, ar)) {
view3d_xr_mirror_setup(wm, depsgraph, scene, v3d, ar, rect);
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 1e7ec667fa8..1b89bb6d77e 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -326,8 +326,8 @@ if(WITH_INPUT_NDOF)
add_definitions(-DWITH_INPUT_NDOF)
endif()
-if(WITH_OPENXR)
- add_definitions(-DWITH_OPENXR)
+if(WITH_XR_OPENXR)
+ add_definitions(-DWITH_XR_OPENXR)
endif()
# Build makesrna executable
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index d521de1f136..bfee0b47056 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -860,7 +860,7 @@ void WM_generic_callback_free(struct wmGenericCallback *callback);
void WM_generic_user_data_free(struct wmGenericUserData *user_data);
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
/* wm_xr.c */
bool WM_xr_is_session_running(const wmXrData *xr);
void WM_xr_session_state_viewer_location_get(const wmXrData *xr, float location[3]);
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 634b1ac9dba..a039f695475 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -355,7 +355,7 @@ void wm_close_and_free(bContext *C, wmWindowManager *wm)
wm_autosave_timer_ended(wm);
}
-#ifdef WITH_OPENXR
+#ifdef WITH_XR_OPENXR
/* May send notifier, so do before freeing notifier queue. */
wm_xr_data_destroy(wm);
#endif
@@ -381,7 +381,7 @@ void wm_close_and_free(bContext *C, wmWindowManager *wm)
}
#ifdef WITH_XR_OPENXR
- wm_xr_context_destroy(wm);
+ wm_xr_data_destroy(wm);
#endif
BLI_freelistN(&wm->paintcursors);
More information about the Bf-blender-cvs
mailing list