[Bf-blender-cvs] [cf122063115] xr-actions-D9124: Merge branch 'master' into xr-actions-D9124

[Peter Kim]

Commit: cf12206311578beeb8aeb8071abb0d82bbeb75d0
Author: Peter Kim
Date:   Tue Feb 9 00:44:48 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBcf12206311578beeb8aeb8071abb0d82bbeb75d0

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc intern/ghost/intern/GHOST_XrSession.cpp
index 4eb86470bfa,a1fd7fc2781..395d0148767
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@@ -435,21 -364,9 +435,21 @@@ static void copy_openxr_pose_to_ghost_p
    r_ghost_pose.orientation_quat[3] = oxr_pose.orientation.z;
  }
  
 +static void copy_ghost_pose_to_openxr_pose(const GHOST_XrPose &ghost_pose, XrPosef &r_oxr_pose)
 +{
 +  /* Set and convert to OpenXR coodinate space. */
 +  r_oxr_pose.position.x = ghost_pose.position[0];
 +  r_oxr_pose.position.y = ghost_pose.position[1];
 +  r_oxr_pose.position.z = ghost_pose.position[2];
 +  r_oxr_pose.orientation.w = ghost_pose.orientation_quat[0];
 +  r_oxr_pose.orientation.x = ghost_pose.orientation_quat[1];
 +  r_oxr_pose.orientation.y = ghost_pose.orientation_quat[2];
 +  r_oxr_pose.orientation.z = ghost_pose.orientation_quat[3];
 +}
 +
  static void ghost_xr_draw_view_info_from_view(const XrView &view, GHOST_XrDrawViewInfo &r_info)
  {
-   /* Set and convert to Blender coodinate space. */
+   /* Set and convert to Blender coordinate space. */
    copy_openxr_pose_to_ghost_pose(view.pose, r_info.eye_pose);
  
    r_info.fov.angle_left = view.fov.angleLeft;
diff --cc release/scripts/addons
index 9ce157e20f8,dfeb905d62a..eba08497327
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 9ce157e20f89aa1a16c0517ef95b98aae2a31b22
 -Subproject commit dfeb905d62ae6d759d8da930f291e73505e6ca67
++Subproject commit eba0849732791a1774dd2c26c3f5da9dae0e33ec
diff --cc source/blender/editors/transform/transform_convert.h
index 8f276d7c247,00aa72d97f2..7a9fed3d5e7
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@@ -217,10 -187,6 +189,9 @@@ void special_aftertrans_update__node(bC
  
  /* transform_convert_object.c */
  void createTransObject(bContext *C, TransInfo *t);
- void createTransTexspace(TransInfo *t);
 +void autokeyframe_object(
 +    bContext *C, struct Scene *scene, struct ViewLayer *view_layer, Object *ob, int tmode);
 +bool motionpath_need_update_object(Scene *scene, Object *ob);
  void recalcData_objects(TransInfo *t);
  void special_aftertrans_update__object(bContext *C, TransInfo *t);
  
diff --cc source/blender/windowmanager/WM_keymap.h
index 2373cd6c4c6,564afe084b9..8224a896e0f
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@@ -86,10 -86,7 +86,10 @@@ bool WM_keymap_remove(struct wmKeyConfi
  bool WM_keymap_poll(struct bContext *C, struct wmKeyMap *keymap);
  
  wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id);
 +wmKeyMapItem *WM_keymap_item_find_xr(struct wmKeyMap *keymap,
 +                                     const char *action_set,
 +                                     const char *action);
- bool WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
+ bool WM_keymap_item_compare(const struct wmKeyMapItem *k1, const struct wmKeyMapItem *k2);
  
  /* keymap_utils.c */