[Bf-blender-cvs] [c9f0da5b200] xr-actions-D9124: XR: Adjust raycast select property behavior

[Peter Kim]

Commit: c9f0da5b20035922379bcb26b1bbf058bf688f8d
Author: Peter Kim
Date:   Wed Nov 25 22:32:43 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBc9f0da5b20035922379bcb26b1bbf058bf688f8d

XR: Adjust raycast select property behavior

Combinations of properties (extend/deselect/toggle/deselect on empty)
now match view3d.select behavior.

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

M	source/blender/windowmanager/xr/intern/wm_xr_operators.c

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

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.c b/source/blender/windowmanager/xr/intern/wm_xr_operators.c
index 54aede1b01a..56a0847fcea 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_operators.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.c
@@ -422,7 +422,7 @@ static bool wm_xr_select_raycast(bContext *C,
     }
 
     if (!hit) {
-      if (deselect_all && (select_op == SEL_OP_SET)) {
+      if (deselect_all) {
         changed = EDBM_mesh_deselect_all_multi(C);
       }
     }
@@ -461,7 +461,7 @@ static bool wm_xr_select_raycast(bContext *C,
     }
   }
   else if (vc.em) {
-    if (deselect_all && (select_op == SEL_OP_SET)) {
+    if (deselect_all) {
       changed = EDBM_mesh_deselect_all_multi(C);
     }
 
@@ -476,7 +476,7 @@ static bool wm_xr_select_raycast(bContext *C,
     }
 
     if (!hit) {
-      if (deselect_all && (select_op == SEL_OP_SET)) {
+      if (deselect_all) {
         changed = object_deselect_all_except(vc.view_layer, NULL);
       }
     }
@@ -564,17 +564,17 @@ static int wm_xr_select_raycast_modal_3d(bContext *C, wmOperator *op, const wmEv
     prop = RNA_struct_find_property(op->ptr, "distance");
     ray_dist = prop ? RNA_property_float_get(op->ptr, prop) : BVH_RAYCAST_DIST_MAX;
 
-    prop = RNA_struct_find_property(op->ptr, "extend");
+    prop = RNA_struct_find_property(op->ptr, "toggle");
     if (prop && RNA_property_boolean_get(op->ptr, prop)) {
-      select_op = SEL_OP_ADD;
+      select_op = SEL_OP_XOR;
     }
     prop = RNA_struct_find_property(op->ptr, "deselect");
     if (prop && RNA_property_boolean_get(op->ptr, prop)) {
       select_op = SEL_OP_SUB;
     }
-    prop = RNA_struct_find_property(op->ptr, "toggle");
+    prop = RNA_struct_find_property(op->ptr, "extend");
     if (prop && RNA_property_boolean_get(op->ptr, prop)) {
-      select_op = SEL_OP_XOR;
+      select_op = SEL_OP_ADD;
     }
 
     prop = RNA_struct_find_property(op->ptr, "deselect_all");