[Bf-blender-cvs] [a5d1f3e4c5c] xr-controller-support: Merge branch 'master' into temp-xr-actions-D9124

[Peter Kim]

Commit: a5d1f3e4c5c1a1f92c52cd157e025a33f58b6adf
Author: Peter Kim
Date:   Fri May 14 21:36:39 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBa5d1f3e4c5c1a1f92c52cd157e025a33f58b6adf

Merge branch 'master' into temp-xr-actions-D9124

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



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

diff --cc release/scripts/addons
index 010723e443c,bb16aba5bd3..80d0ea1e36e
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 010723e443c6f404eea43ab531163289e558ba8a
 -Subproject commit bb16aba5bd3873794eefe167497118b6063b9a85
++Subproject commit 80d0ea1e36ea4299e1ae76fdb3cbbb3b6ba20dcb
diff --cc source/blender/windowmanager/intern/wm_window.c
index 976c925c69d,cdd5ea12df8..579b75e8a1a
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -1560,11 -1560,14 +1560,14 @@@ void wm_window_process_events(const bCo
  #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. */
 -  has_event |= wm_xr_events_handle(CTX_wm_manager(C));
 +  hasevent |= wm_xr_events_handle(C);
  #endif
  
-   /* no event, we sleep 5 milliseconds */
-   if (hasevent == 0) {
+   /* When there is no event, sleep 5 milliseconds not to use too much CPU when idle.
+    *
+    * Skip sleeping when simulating events so tests don't idle unnecessarily as simulated
+    * events are typically generated from a timer that runs in the main loop. */
+   if ((has_event == false) && !(G.f & G_FLAG_EVENT_SIMULATE)) {
      PIL_sleep_ms(5);
    }
  }