blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix proportional editing always enabled if the property exists in the 

operator

Fixes T64010, T64011

Reviewers: brecht

Maniphest Tasks: T64010, T64011

Differential Revision: https://developer.blender.org/D4764
This commit is contained in:
Philipp Oeser 2019-04-30 14:32:35 +02:00
parent 34944a2035
commit 40b66ac2a6
Notes: blender-bot 2023-02-14 02:52:31 +01:00 
Referenced by issue #64010, Extrude has proportional editing turned on all the time in the latest build resetting to factory defaults doesn't help
Referenced by issue #64011, SHIFT D to Duplicate is activating proportional editing and moving the primary object from its initial place
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/transform/transform_generics.c
View File

@ -1654,12 +1654,15 @@ 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, "use_proportional_edit"))) {
if (RNA_property_is_set(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;
int proportional = 0;
if (RNA_boolean_get(op->ptr, "use_proportional_edit")) {
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);
}