Revert "Fix T78259: Proportional editing does not work in particle editing"
This reverts commit 5c48592ccd
.
Ii introduced a stupid error.
Fix T78352
This commit is contained in:
parent
d7b10e5b74
commit
9f5fae1f2c
Notes:
blender-bot
2023-02-14 12:01:57 +01:00
Referenced by issue #78352, Proportional edit mode stucks from edit mode to object mode and force it to be turned on always (fresh regression) Referenced by issue #78259, Proportional Edit does not work in particle editing
|
@ -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)));
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue