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

[Peter Kim]

Commit: 2ddf55f358047b1167c47e8e880ecb78922c4720
Author: Peter Kim
Date:   Sun Jan 17 18:45:20 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB2ddf55f358047b1167c47e8e880ecb78922c4720

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc release/scripts/addons
index 91a0b536b04,a3fa40ec0ba..9ce157e20f8
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 91a0b536b043c7e15ab50c054d0360aa4195568e
 -Subproject commit a3fa40ec0ba525bc96cbfad49f854a0230b0524e
++Subproject commit 9ce157e20f89aa1a16c0517ef95b98aae2a31b22
diff --cc release/scripts/modules/bl_keymap_utils/io.py
index 4bce843aa38,7adcd799c0f..cf28ac53051
--- a/release/scripts/modules/bl_keymap_utils/io.py
+++ b/release/scripts/modules/bl_keymap_utils/io.py
@@@ -76,16 -74,12 +76,18 @@@ def kmi_args_as_data(kmi)
          s.append(f"\"key_modifier\": '{kmi.key_modifier}'")
  
      if kmi.repeat:
-         if kmi.map_type == 'KEYBOARD':
-             if kmi.value in {'PRESS', 'ANY'}:
-                 s.append("\"repeat\": True")
+         if (
+                 (kmi.map_type == 'KEYBOARD' and kmi.value in {'PRESS', 'ANY'}) or
+                 (kmi.map_type == 'TEXTINPUT')
+         ):
+             s.append("\"repeat\": True")
  
 +    if kmi.map_type == 'XR':
 +        if kmi.xr_action_set:
 +            s.append(f"\"xr_action_set\": '{kmi.xr_action_set}'")
 +        if kmi.xr_action:
 +            s.append(f"\"xr_action\": '{kmi.xr_action}'")
 +
      return "{" + ", ".join(s) + "}"
  
  
diff --cc source/blender/editors/transform/transform_convert.h
index 50c55745fac,be4322b42e2..8f276d7c247
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@@ -28,15 -30,10 +30,12 @@@ struct BMesh
  struct FCurve;
  struct ListBase;
  struct Object;
 +struct Scene;
  struct TransData;
- struct TransDataContainer;
  struct TransDataCurveHandleFlags;
  struct TransInfo;
 +struct ViewLayer;
  struct bContext;
- struct bKinematicConstraint;
- struct bPoseChannel;
  
  /* transform_convert.c */
  void transform_autoik_update(TransInfo *t, short mode);
diff --cc source/blender/makesrna/intern/rna_wm.c
index ecdd2ac0009,d67d62d7af9..3ee98284b52
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@@ -40,37 -40,8 +40,12 @@@
  
  #include "WM_types.h"
  
 +#ifdef WITH_XR_OPENXR
 +#  include "../ghost/GHOST_Types.h"
 +#endif
 +
  #ifdef RNA_RUNTIME
  
- static const EnumPropertyItem event_keymouse_value_items[] = {
-     {KM_ANY, "ANY", 0, "Any", ""},
-     {KM_PRESS, "PRESS", 0, "Press", ""},
-     {KM_RELEASE, "RELEASE", 0, "Release", ""},
-     {KM_CLICK, "CLICK", 0, "Click", ""},
-     {KM_DBL_CLICK, "DOUBLE_CLICK", 0, "Double Click", ""},
-     {KM_CLICK_DRAG, "CLICK_DRAG", 0, "Click Drag", ""},
-     /* Used for NDOF and trackpad events. */
-     {KM_NOTHING, "NOTHING", 0, "Nothing", ""},
-     {0, NULL, 0, NULL, NULL},
- };
- 
- static const EnumPropertyItem event_tweak_value_items[] = {
-     {KM_ANY, "ANY", 0, "Any", ""},
-     {EVT_GESTURE_N, "NORTH", 0, "North", ""},
-     {EVT_GESTURE_NE, "NORTH_EAST", 0, "North-East", ""},
-     {EVT_GESTURE_E, "EAST", 0, "East", ""},
-     {EVT_GESTURE_SE, "SOUTH_EAST", 0, "South-East", ""},
-     {EVT_GESTURE_S, "SOUTH", 0, "South", ""},
-     {EVT_GESTURE_SW, "SOUTH_WEST", 0, "South-West", ""},
-     {EVT_GESTURE_W, "WEST", 0, "West", ""},
-     {EVT_GESTURE_NW, "NORTH_WEST", 0, "North-West", ""},
-     {0, NULL, 0, NULL, NULL},
- };
- 
  static const EnumPropertyItem event_tweak_type_items[] = {
      {EVT_TWEAK_L, "EVT_TWEAK_L", 0, "Left", ""},
      {EVT_TWEAK_M, "EVT_TWEAK_M", 0, "Middle", ""},
diff --cc source/blender/makesrna/intern/rna_xr.c
index 6c010f0304c,04a8500d136..8e269b84e48
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@@ -790,22 -118,6 +790,22 @@@ static void rna_def_xr_session_settings
        {0, NULL, 0, NULL, NULL},
    };
  
 +  static const EnumPropertyItem controller_draw_styles[] = {
 +      {XR_CONTROLLER_DRAW_AXES, "AXES", 0, "Axes", "Draw controller's local axes"},
-       {XR_CONTROLLER_DRAW_RAY, "RAY", 0, "Ray", "Draw a ray along controller's -Z axis "},
++      {XR_CONTROLLER_DRAW_RAY, "RAY", 0, "Ray", "Draw a ray along controller's -Z axis"},
 +      {0, NULL, 0, NULL, NULL},
 +  };
 +
 +  static const EnumPropertyItem selection_eyes[] = {
 +      {XR_EYE_LEFT, "EYE_LEFT", 0, "Left Eye", "Use the left eye's perspective for VR selection"},
 +      {XR_EYE_RIGHT,
 +       "EYE_RIGHT",
 +       0,
 +       "Right Eye",
 +       "Use the right eye's perspective for VR selection"},
 +      {0, NULL, 0, NULL, NULL},
 +  };
 +
    srna = RNA_def_struct(brna, "XrSessionSettings", NULL);
    RNA_def_struct_ui_text(srna, "XR Session Settings", "");