[Bf-blender-cvs] [9f5fae1f2c1] master: Revert "Fix T78259: Proportional editing does not work in particle editing"

[Germano Cavalcante]

Commit: 9f5fae1f2c1686cea3e23c1c7757ec7219b9d117
Author: Germano Cavalcante
Date:   Sat Jun 27 11:12:46 2020 -0300
Branches: master
https://developer.blender.org/rB9f5fae1f2c1686cea3e23c1c7757ec7219b9d117

Revert "Fix T78259: Proportional editing does not work in particle editing"

This reverts commit 5c48592ccde08e18d13255e89d09067d5dc0f771.
Ii introduced a stupid error.

Fix T78352

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

M	source/blender/editors/transform/transform_convert.c
M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 71e5bca70b1..ce37cb9dacd 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1086,6 +1086,7 @@ void createTransData(bContext *C, TransInfo *t)
       convert_type = TC_MBALL_VERTS;
     }
     else if (t->obedit_type == OB_ARMATURE) {
+      t->flag &= ~T_PROP_EDIT;
       convert_type = TC_ARMATURE_VERTS;
     }
   }
@@ -1163,7 +1164,6 @@ void createTransData(bContext *C, TransInfo *t)
       break;
     case TC_ARMATURE_VERTS:
       createTransArmatureVerts(t);
-      init_prop_edit = false;
       break;
     case TC_CURSOR_IMAGE:
       createTransCursor_image(t);
@@ -1291,10 +1291,6 @@ void createTransData(bContext *C, TransInfo *t)
        * and are still added into transform data. */
       sort_trans_data_selected_first(t);
     }
-
-    if (!init_prop_edit) {
-      t->flag &= ~T_PROP_EDIT;
-    }
   }
 
   BLI_assert((!(t->flag & T_EDIT)) == (!(t->obedit_type != -1)));
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index a8f742a8610..32b23ad7ff3 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -650,9 +650,34 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
       t->flag |= initTransInfo_edit_pet_to_flag(proportional);
     }
     else {
-      /* Use settings from scene only if modal. */
-      if (t->flag & T_MODAL && (t->options & CTX_NO_PET) == 0) {
-        t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_edit);
+      /* use settings from scene only if modal */
+      if (t->flag & T_MODAL) {
+        if ((t->options & CTX_NO_PET) == 0) {
+          if (t->spacetype == SPACE_GRAPH) {
+            t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_fcurve);
+          }
+          else if (t->spacetype == SPACE_ACTION) {
+            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_edit);
+          }
+          else if (t->options & CTX_GPENCIL_STROKES) {
+            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_edit & PROP_EDIT_CONNECTED) {
+                t->flag |= T_PROP_CONNECTED;
+              }
+            }
+          }
+          else if (!(t->options & CTX_CURSOR) && ts->proportional_objects) {
+            t->flag |= T_PROP_EDIT;
+          }
+        }
       }
     }