[Bf-blender-cvs] [b0825be786b] xr-dev: Merge branch 'master' into xr-dev

[Peter Kim]

Commit: b0825be786b1fb98e9a446a88c2c7221f949ce10
Author: Peter Kim
Date:   Mon Apr 4 16:34:36 2022 +0900
Branches: xr-dev
https://developer.blender.org/rBb0825be786b1fb98e9a446a88c2c7221f949ce10

Merge branch 'master' into xr-dev

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



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

diff --cc source/blender/windowmanager/xr/intern/wm_xr_intern.h
index ecc86917e3d,3fc1f362541..c493deba7e4
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
@@@ -183,13 -183,8 +183,14 @@@ typedef struct wmXrActionSet 
    ListBase active_haptic_actions;
  } wmXrActionSet;
  
 +typedef struct wmXrMotionCapturePose {
 +  struct wmXrMotionCapturePose *next, *prev;
 +  const Object *ob;
 +  GHOST_XrPose pose;
 +} wmXrMotionCapturePose;
 +
  /* wm_xr.c */
+ 
  wmXrRuntimeData *wm_xr_runtime_data_create(void);
  void wm_xr_runtime_data_free(wmXrRuntimeData **runtime);
  
diff --cc source/blender/windowmanager/xr/wm_xr.h
index 1d84e49a343,5eb17ceac4b..57adb4ff3c0
--- a/source/blender/windowmanager/xr/wm_xr.h
+++ b/source/blender/windowmanager/xr/wm_xr.h
@@@ -16,7 -16,8 +17,8 @@@ typedef void (*wmXrSessionExitFn)(cons
  bool wm_xr_init(wmWindowManager *wm);
  void wm_xr_exit(wmWindowManager *wm);
  void wm_xr_session_toggle(wmWindowManager *wm, wmWindow *win, wmXrSessionExitFn session_exit_fn);
 -bool wm_xr_events_handle(wmWindowManager *wm);
 +bool wm_xr_events_handle(const struct bContext *C);
  
  /* wm_xr_operators.c */
+ 
  void wm_xr_operatortypes_register(void);