UI: reorganize proportional editing options

- Move connected & projected into individual toggles.
- Top-level proportional editing button now only toggles.
- Use popover for proportional edit-mode falloff and options.

Note that it's no longer possible to toggle connected via key bindings,
although this could be supported again if it's needed.

Resolves T58081

3 files changed, 43 insertions, 42 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index c80a0eaa597..edbc0f90a7d 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2101,20 +2101,16 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
     }
   }
 
-  /* convert flag to enum */
-  switch (t->flag & T_PROP_EDIT_ALL) {
-    case T_PROP_EDIT:
-      proportional = PROP_EDIT_ON;
-      break;
-    case (T_PROP_EDIT | T_PROP_CONNECTED):
-      proportional = PROP_EDIT_CONNECTED;
-      break;
-    case (T_PROP_EDIT | T_PROP_PROJECTED):
-      proportional = PROP_EDIT_PROJECTED;
-      break;
-    default:
-      proportional = PROP_EDIT_OFF;
-      break;
+  if (t->flag & T_PROP_EDIT_ALL) {
+    if (t->flag & T_PROP_EDIT) {
+      proportional |= PROP_EDIT_USE;
+    }
+    if (t->flag & T_PROP_CONNECTED) {
+      proportional |= PROP_EDIT_CONNECTED;
+    }
+    if (t->flag & T_PROP_PROJECTED) {
+      proportional |= PROP_EDIT_PROJECTED;
+    }
   }
 
   // If modal, save settings back in scene if not set as operator argument
@@ -2123,7 +2119,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 
     /* skip saving proportional edit if it was not actually used */
     if (!(t->options & CTX_NO_PET)) {
-      if ((prop = RNA_struct_find_property(op->ptr, "proportional")) &&
+      if ((prop = RNA_struct_find_property(op->ptr, "use_proportional_edit")) &&
           !RNA_property_is_set(op->ptr, prop)) {
         if (t->spacetype == SPACE_GRAPH) {
           ts->proportional_fcurve = proportional;
@@ -2132,13 +2128,13 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
           ts->proportional_action = proportional;
         }
         else if (t->obedit_type != -1) {
-          ts->proportional = proportional;
+          ts->proportional_edit = proportional;
         }
         else if (t->options & CTX_MASK) {
-          ts->proportional_mask = (proportional != PROP_EDIT_OFF);
+          ts->proportional_mask = proportional != 0;
         }
         else {
-          ts->proportional_objects = (proportional != PROP_EDIT_OFF);
+          ts->proportional_objects = proportional != 0;
         }
       }
 
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 7f049f480d7..d3079aebd00 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1239,16 +1239,17 @@ void resetTransRestrictions(TransInfo *t)
 
 static int initTransInfo_edit_pet_to_flag(const int proportional)
 {
-  switch (proportional) {
-    case PROP_EDIT_ON:
-      return T_PROP_EDIT;
-    case PROP_EDIT_CONNECTED:
-      return T_PROP_EDIT | T_PROP_CONNECTED;
-    case PROP_EDIT_PROJECTED:
-      return T_PROP_EDIT | T_PROP_PROJECTED;
-    default:
-      return 0;
+  int flag = 0;
+  if (proportional & PROP_EDIT_USE) {
+    flag |= T_PROP_EDIT;
   }
+  if (proportional & PROP_EDIT_CONNECTED) {
+    flag |= T_PROP_CONNECTED;
+  }
+  if (proportional & PROP_EDIT_PROJECTED) {
+    flag |= T_PROP_PROJECTED;
+  }
+  return flag;
 }
 
 void initTransDataContainers_FromObjectData(TransInfo *t,
@@ -1651,9 +1652,16 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
   }
 
   /* setting PET flag only if property exist in operator. Otherwise, assume it's not supported */
-  if (op && (prop = RNA_struct_find_property(op->ptr, "proportional"))) {
+  if (op && (prop = RNA_struct_find_property(op->ptr, "use_proportional_edit"))) {
     if (RNA_property_is_set(op->ptr, prop)) {
-      t->flag |= initTransInfo_edit_pet_to_flag(RNA_property_enum_get(op->ptr, prop));
+      int proportional = PROP_EDIT_USE;
+      if (RNA_boolean_get(op->ptr, "use_proportional_connected")) {
+        proportional |= PROP_EDIT_CONNECTED;
+      }
+      if (RNA_boolean_get(op->ptr, "use_proportional_projected")) {
+        proportional |= PROP_EDIT_PROJECTED;
+      }
+      t->flag |= initTransInfo_edit_pet_to_flag(proportional);
     }
     else {
       /* use settings from scene only if modal */
@@ -1666,16 +1674,16 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
             t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_action);
           }
           else if (t->obedit_type != -1) {
-            t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional);
+            t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_edit);
           }
           else if (t->options & CTX_GPENCIL_STROKES) {
-            t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional);
+            t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_edit);
           }
           else if (t->options & CTX_MASK) {
             if (ts->proportional_mask) {
               t->flag |= T_PROP_EDIT;
 
-              if (ts->proportional == PROP_EDIT_CONNECTED) {
+              if (ts->proportional_edit & PROP_EDIT_CONNECTED) {
                 t->flag |= T_PROP_CONNECTED;
               }
             }
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index b4c539fba8e..0c2f77852a3 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -547,10 +547,9 @@ static bool transform_poll_property(const bContext *UNUSED(C),
 
   /* Proportional Editing. */
   {
-    PropertyRNA *prop_pet = RNA_struct_find_property(op->ptr, "proportional");
-    if (prop_pet && (prop_pet != prop) &&
-        (RNA_property_enum_get(op->ptr, prop_pet) == PROP_EDIT_OFF)) {
-      if (STRPREFIX(prop_id, "proportional")) {
+    PropertyRNA *prop_pet = RNA_struct_find_property(op->ptr, "use_proportional_edit");
+    if (prop_pet && (prop_pet != prop) && (RNA_property_boolean_get(op->ptr, prop_pet) == false)) {
+      if (STRPREFIX(prop_id, "proportional") || STRPREFIX(prop_id, "use_proportional")) {
         return false;
       }
     }
@@ -610,12 +609,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
   }
 
   if (flags & P_PROPORTIONAL) {
-    RNA_def_enum(ot->srna,
-                 "proportional",
-                 rna_enum_proportional_editing_items,
-                 0,
-                 "Proportional Editing",
-                 "");
+    RNA_def_boolean(ot->srna, "use_proportional_edit", 0, "Proportional Editing", "");
     prop = RNA_def_enum(ot->srna,
                         "proportional_edit_falloff",
                         rna_enum_proportional_falloff_items,
@@ -633,6 +627,9 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
                   "",
                   0.001f,
                   100.0f);
+
+    RNA_def_boolean(ot->srna, "use_proportional_connected", 0, "Connected", "");
+    RNA_def_boolean(ot->srna, "use_proportional_projected", 0, "Projected (2D)", "");
   }
 
   if (flags & P_SNAP) {