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

[Peter Kim]

Commit: 0f1ef110a47f8557bdcf3ecb380fd9666f110018
Author: Peter Kim
Date:   Thu Aug 26 19:29:20 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB0f1ef110a47f8557bdcf3ecb380fd9666f110018

Merge branch 'master' into xr-controller-support

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



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

diff --cc source/blender/windowmanager/WM_types.h
index 51cbdf71982,8a1ff67b37c..d1433e6e1e1
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -109,15 -109,13 +109,15 @@@
  #pragma once
  
  struct ID;
 +struct IDProperty;
  struct ImBuf;
  struct bContext;
+ struct wmDrag;
+ struct wmDropBox;
  struct wmEvent;
  struct wmOperator;
 +struct wmOperatorType;
  struct wmWindowManager;
- struct wmDrag;
- struct wmDropBox;
  
  #include "BLI_compiler_attrs.h"
  #include "DNA_listBase.h"