[Bf-blender-cvs] [79ed8f21f7e] xr-controller-support: Fix merge-related error

[Peter Kim]

Commit: 79ed8f21f7e8393ed636641d5249e1b9301c9239
Author: Peter Kim
Date:   Fri May 14 22:02:45 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB79ed8f21f7e8393ed636641d5249e1b9301c9239

Fix merge-related error

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

M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 579b75e8a1a..6e44927ee40 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1560,7 +1560,7 @@ void wm_window_process_events(const bContext *C)
 #ifdef WITH_XR_OPENXR
   /* XR events don't use the regular window queues. So here we don't only trigger
    * processing/dispatching but also handling. */
-  hasevent |= wm_xr_events_handle(C);
+  has_event |= wm_xr_events_handle(C);
 #endif
 
   /* When there is no event, sleep 5 milliseconds not to use too much CPU when idle.