diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 01:01:38 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 01:07:44 +0300 |
commit | cfbd605567f48229a923df382baf6db98fbafc61 (patch) | |
tree | d4218c49672047d6c3b37517034660b3b5dcd966 /source/blender/editors/transform/transform_constraints.c | |
parent | 71a57a37b2eebbed53b5335019287b4df9c30519 (diff) | |
parent | 7212ebd09f9720883581221be923ae5e97ff5d76 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/texture.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/blender/editors/transform/transform_constraints.c')
-rw-r--r-- | source/blender/editors/transform/transform_constraints.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 13cc0c22778..d7b670b6476 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -187,9 +187,7 @@ static void viewAxisCorrectCenter(TransInfo *t, float t_con_center[3]) if (l < min_dist) { float diff[3]; - normalize_v3_v3(diff, t->viewinv[2]); - mul_v3_fl(diff, min_dist - l); - + normalize_v3_v3_length(diff, t->viewinv[2], min_dist - l); sub_v3_v3(t_con_center, diff); } } @@ -225,9 +223,8 @@ static void axisProjection(TransInfo *t, const float axis[3], const float in[3], if (factor < 0.0f) factor *= -factor; else factor *= factor; - copy_v3_v3(out, axis); - normalize_v3(out); - mul_v3_fl(out, -factor); /* -factor makes move down going backwards */ + /* -factor makes move down going backwards */ + normalize_v3_v3_length(out, axis, -factor); } else { float v[3], i1[3], i2[3]; |