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-26 18:02:52 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-06-26 18:03:04 +0300
commit5c48592ccde08e18d13255e89d09067d5dc0f771 (patch)
tree09aa9cda9a5d7714f23de0c729d0fac60116687c /source/blender/editors/transform/transform_generics.c
parente6e67da4ea5026a26e0a1ead19ae91412a74bc4d (diff)
Fix T78259: Proportional editing does not work in particle editing
This is a long-standing bug, possibly proportional editing never worked in particle mode. Some parameter definitions in the transform code are scattered and sometimes duplicated. Proportional editing is a parameter that depends only on the Convert type and not `spacetype`, `CTX_` or `obedit_type`.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 32b23ad7ff3..a8f742a8610 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -650,34 +650,9 @@ 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) {
- 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;
- }
- }
+ /* 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);
}
}