diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
| commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
| tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /source/blender/editors/transform/transform.c | |
| parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
| parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) | |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index f3d26f85471..74fc1406795 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5262,12 +5262,12 @@ static void applyTranslationValue(TransInfo *t, const float vec[3]) copy_v3_v3(tvec, vec); } + mul_m3_v3(td->smtx, tvec); + if (use_rotate_offset) { add_v3_v3(tvec, rotate_offset); } - mul_m3_v3(td->smtx, tvec); - if (t->options & CTX_GPENCIL_STROKES) { /* grease pencil multiframe falloff */ bGPDstroke *gps = (bGPDstroke *)td->extra; |