[Bf-blender-cvs] [f2f1e4dfeda] temp-ghost_openxr: Remove CTX_wm_xr_context

[Julian Eisel]

Commit: f2f1e4dfedaeb8393257380b95a58800dfbb928e
Author: Julian Eisel
Date:   Wed Jun 19 01:00:37 2019 +0200
Branches: temp-ghost_openxr
https://developer.blender.org/rBf2f1e4dfedaeb8393257380b95a58800dfbb928e

Remove CTX_wm_xr_context

Not really useful, plus XR-Context is now GHOST data.

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

M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index e2e532cbe91..0d2998cc51e 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -157,9 +157,6 @@ struct ARegion *CTX_wm_menu(const bContext *C);
 struct wmGizmoGroup *CTX_wm_gizmo_group(const bContext *C);
 struct wmMsgBus *CTX_wm_message_bus(const bContext *C);
 struct ReportList *CTX_wm_reports(const bContext *C);
-#ifdef WITH_OPENXR
-struct GHOST_XRContext *CTX_wm_xr_context(const bContext *C);
-#endif
 
 struct View3D *CTX_wm_view3d(const bContext *C);
 struct RegionView3D *CTX_wm_region_view3d(const bContext *C);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index e9b8fa3d234..4ae87713aa5 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -742,13 +742,6 @@ struct ReportList *CTX_wm_reports(const bContext *C)
   return NULL;
 }
 
-#ifdef WITH_OPENXR
-struct GHOST_XRContext *CTX_wm_xr_context(const bContext *C)
-{
-  return C->wm.manager ? C->wm.manager->xr_context : NULL;
-}
-#endif
-
 View3D *CTX_wm_view3d(const bContext *C)
 {
   ScrArea *sa = CTX_wm_area(C);
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 4a9342b6f69..0e2b5f26675 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1657,7 +1657,7 @@ void wm_window_process_events(const bContext *C)
   }
   hasevent |= wm_window_timer(C);
 #ifdef WITH_OPENXR
-  hasevent |= GHOST_XR_events_handle(CTX_wm_xr_context(C));
+  hasevent |= GHOST_XR_events_handle(CTX_wm_manager(C)->xr_context);
 #endif
 
   /* no event, we sleep 5 milliseconds */