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_convert.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_convert.c')
-rw-r--r--source/blender/editors/transform/transform_convert.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index ce37cb9dacd..71e5bca70b1 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1086,7 +1086,6 @@ 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;
}
}
@@ -1164,6 +1163,7 @@ 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,6 +1291,10 @@ 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)));