[Bf-blender-cvs] [a2d04deda79] soc-2019-openxr: Remove in-place call to create reports-popup

[Julian Eisel]

Commit: a2d04deda79633c3a0c7306f36b8100cf2f4b49b
Author: Julian Eisel
Date:   Wed Mar 11 15:33:04 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBa2d04deda79633c3a0c7306f36b8100cf2f4b49b

Remove in-place call to create reports-popup

To be replaced by D7113.

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

M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_xr.c
M	source/blender/windowmanager/wm.h

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

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index d1b4400ff13..16f2f822338 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3651,7 +3651,7 @@ static int wm_xr_session_toggle_exec(bContext *C, wmOperator *UNUSED(op))
   wmWindowManager *wm = CTX_wm_manager(C);
 
   /* Lazy-create xr context - tries to dynlink to the runtime, reading active_runtime.json. */
-  if (wm_xr_context_ensure(C, wm) == false) {
+  if (wm_xr_context_ensure(wm) == false) {
     return OPERATOR_CANCELLED;
   }
 
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index d90d513ff6c..be6af48f5de 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -74,7 +74,6 @@ typedef struct {
 
 typedef struct {
   wmWindowManager *wm;
-  bContext *evil_C;
 } wmXrErrorHandlerData;
 
 void wm_xr_draw_view(const GHOST_XrDrawViewInfo *, void *);
@@ -99,7 +98,6 @@ static void wm_xr_error_handler(const GHOST_XrError *error)
   BKE_reports_clear(&wm->reports);
   WM_report(RPT_ERROR, error->user_message);
   WM_report_banner_show();
-  UI_popup_menu_reports(handler_data->evil_C, &wm->reports);
 
   if (wm->xr.context) {
     /* Just play safe and destroy the entire context. */
@@ -108,7 +106,7 @@ static void wm_xr_error_handler(const GHOST_XrError *error)
   }
 }
 
-bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm)
+bool wm_xr_context_ensure(wmWindowManager *wm)
 {
   if (wm->xr.context) {
     return true;
@@ -117,7 +115,6 @@ bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm)
 
   /* Set up error handling */
   error_customdata.wm = wm;
-  error_customdata.evil_C = C;
   GHOST_XrErrorHandler(wm_xr_error_handler, &error_customdata);
 
   {
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index c79f5376c25..7904573de0c 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -101,7 +101,7 @@ void wm_open_init_use_scripts(wmOperator *op, bool use_prefs);
 
 #ifdef WITH_XR_OPENXR
 /* wm_xr.c */
-bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm);
+bool wm_xr_context_ensure(wmWindowManager *wm);
 void wm_xr_context_destroy(wmWindowManager *wm);
 void wm_xr_session_toggle(bContext *C, void *xr_context);
 #endif