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

[Peter Kim]

Commit: d2c4094425efa13909078589c6bdcdbf2a7cc936
Author: Peter Kim
Date:   Fri Aug 6 16:20:44 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBd2c4094425efa13909078589c6bdcdbf2a7cc936

Merge branch 'master' into xr-controller-support

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



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

diff --cc source/blender/windowmanager/WM_api.h
index 1f965a8a295,02e8d42e0ff..cb25acd6a1b
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -72,11 -73,10 +73,6 @@@ struct wmTabletData
  struct wmNDOFMotionData;
  #endif
  
--#ifdef WITH_XR_OPENXR
- struct wmXrActionState;
- struct wmXrPose;
 -struct wmXrRuntimeData;
--#endif
--
  typedef struct wmGizmo wmGizmo;
  typedef struct wmGizmoMap wmGizmoMap;
  typedef struct wmGizmoMapType wmGizmoMapType;
diff --cc source/blender/windowmanager/WM_types.h
index ea9daa8da67,485d8e5a162..ac7afbe0dca
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -114,8 -113,9 +114,10 @@@ struct ImBuf
  struct bContext;
  struct wmEvent;
  struct wmOperator;
 +struct wmOperatorType;
  struct wmWindowManager;
+ struct wmDrag;
+ struct wmDropBox;
  
  #include "BLI_compiler_attrs.h"
  #include "DNA_listBase.h"