archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Correct last commit

Browse Source
This commit is contained in:
Campbell Barton
2019-01-15 18:54:43 +11:00
parent b3791d59f6
commit 93867cfafc
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2600,18 +2600,11 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
setUserConstraint(t, t->orientation.user, t->con.mode, "%s"); setUserConstraint(t, t->orientation.user, t->con.mode, "%s");
} }
} }
/* Apply values_modal_offset (after we have constraints). */
/* Don't write into the values when non-modal because they are already set from operator redo values. */
if (t->flag & T_MODAL) { if (t->flag & T_MODAL) {
if (!is_zero_v3(t->values_modal_offset)) { /* Setup the mouse input with initial values. */
float values_ofs[3]; applyMouseInput(t, &t->mouse, t->mouse.imval, t->values);
if (t->con.mode & CON_APPLY) {
mul_v3_m3v3(values_ofs, t->spacemtx, t->values_modal_offset);
}
else {
copy_v3_v3(values_ofs, t->values_modal_offset);
}
add_v3_v3(t->values, values_ofs);
}
} }
if ((prop = RNA_struct_find_property(op->ptr, "preserve_clnor"))) { if ((prop = RNA_struct_find_property(op->ptr, "preserve_clnor"))) {

17
source/blender/editors/transform/transform_input.c
View File

@@ -387,12 +387,6 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode)
if (mi_data_prev && (mi_data_prev != mi->data)) { if (mi_data_prev && (mi_data_prev != mi->data)) {
MEM_freeN(mi_data_prev); MEM_freeN(mi_data_prev);
} }
/* Don't write into the values when non-modal because they are already set from operator redo values. */
if (t->flag & T_MODAL) {
/* bootstrap mouse input with initial values */
applyMouseInput(t, mi, mi->imval, t->values);
}
} }
void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *t, float values[3])) void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *t, float values[3]))
@@ -435,6 +429,17 @@ void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float outp
mi->apply(t, mi, mval_db, output); mi->apply(t, mi, mval_db, output);
} }
if (!is_zero_v3(t->values_modal_offset)) {
float values_ofs[3];
if (t->con.mode & CON_APPLY) {
mul_v3_m3v3(values_ofs, t->spacemtx, t->values_modal_offset);
}
else {
copy_v3_v3(values_ofs, t->values_modal_offset);
}
add_v3_v3(t->values, values_ofs);
}
if (mi->post) { if (mi->post) {
mi->post(t, output); mi->post(t, output);
} }