Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-06-27 17:12:46 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-06-27 17:13:02 +0300
commit9f5fae1f2c1686cea3e23c1c7757ec7219b9d117 (patch)
treea29ec703cb095f9c96c283a8d41e64701c3c6051 /source/blender/editors/transform/transform_generics.c
parentd7b10e5b740fe23f6c713fb9604dcc8b49a83050 (diff)
Revert "Fix T78259: Proportional editing does not work in particle editing"
This reverts commit 5c48592ccde08e18d13255e89d09067d5dc0f771. Ii introduced a stupid error. Fix T78352
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c31
1 files changed, 28 insertions, 3 deletions
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;
+ }
+ }
}
}