[Bf-blender-cvs] [8a103470c93] xr-controller-support: Merge branch 'master' into xr-controller-support

[Peter Kim]

Commit: 8a103470c9310d5f4d458c8b008c546ea97c2ce0
Author: Peter Kim
Date:   Wed Jul 28 13:08:26 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB8a103470c9310d5f4d458c8b008c546ea97c2ce0

Merge branch 'master' into xr-controller-support

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



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

diff --cc intern/ghost/intern/GHOST_XrSession.cpp
index 2fa934f4208,919d11d22a9..22bafc62161
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@@ -151,9 -148,9 +151,9 @@@ static void create_reference_spaces(Ope
  
    if (XR_FAILED(result)) {
      /* One of the rare cases where we don't want to immediately throw an exception on failure,
-        since runtimes are not required to support the stage reference space. Although we need the
+      * since run-times are not required to support the stage reference space. Although we need the
 -     * stage reference space for absolute tracking, if the runtime doesn't support it then just
 -     * fallback to the local space. */
 +       stage reference space for absolute tracking, if the runtime doesn't support it then just
 +       fallback to the local space. */
      if (result == XR_ERROR_REFERENCE_SPACE_UNSUPPORTED) {
        printf(
            "Warning: XR runtime does not support stage reference space, disabling absolute "
diff --cc source/blender/windowmanager/xr/intern/wm_xr_intern.h
index 74809c4d138,6415f96e322..9c425978ed8
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
@@@ -104,16 -92,8 +104,16 @@@ typedef struct wmXrViewportPair 
  } wmXrViewportPair;
  
  typedef struct {
-   /* Offscreen buffers/viewports for each view. */
+   /** Off-screen buffers/viewports for each view. */
    ListBase viewports; /* wmXrViewportPair */
 +
 +  /** XR events. */
 +  ListBase events; /* wmEvent */
 +
 +  /** Dummy region type for controller draw callback. */
 +  struct ARegionType *controller_art;
 +  /** Controller draw callback handle. */
 +  void *controller_draw_handle;
  } wmXrSurfaceData;
  
  typedef struct wmXrDrawData {