diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 10:54:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 10:56:53 +0300 |
commit | 93867cfafcf5474c565505f4f54e89e1cda6c99f (patch) | |
tree | ab09696c5103bc0de8cf71ee57f32c14d5ebb722 /source/blender/editors/transform/transform.c | |
parent | b3791d59f66998ef0552c1c01a95bbecd35afa09 (diff) |
Correct last commit
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r-- | source/blender/editors/transform/transform.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c42e350fd5f..53943eb830e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2600,18 +2600,11 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve 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 (!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); - } + /* Setup the mouse input with initial values. */ + applyMouseInput(t, &t->mouse, t->mouse.imval, t->values); } if ((prop = RNA_struct_find_property(op->ptr, "preserve_clnor"))) { |