diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-11 18:08:25 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-11 18:08:25 +0300 |
commit | 8e44c30d7176ecb9da06948ae66d5aa9dbd3a85f (patch) | |
tree | 7fbb35e32b9067ad513d5faf82d723a2cf4d736e /source/blender/editors/transform/transform_generics.c | |
parent | b4c057f42faa81d490bf785272cce27bc7acc0b9 (diff) | |
parent | 8aa6e4d50bfcc0d83985f783228408586b0f877b (diff) |
Merge branch 'master' into soc-2017-normal-tools
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 4e098cd7585..5a6bcdd0d4f 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1887,14 +1887,6 @@ void calculateCenter(TransInfo *t) if (t->spacetype == SPACE_VIEW3D) { /* ED_view3d_calc_zfac() defines a factor for perspective depth correction, used in ED_view3d_win_to_delta() */ - float vec[3]; - if (t->flag & (T_EDIT | T_POSE)) { - Object *ob = t->obedit ? t->obedit : t->poseobj; - mul_v3_m4v3(vec, ob->obmat, t->center); - } - else { - copy_v3_v3(vec, t->center); - } /* zfac is only used convertViewVec only in cases operator was invoked in RGN_TYPE_WINDOW * and never used in other cases. @@ -1903,7 +1895,7 @@ void calculateCenter(TransInfo *t) * for a region different from RGN_TYPE_WINDOW. */ if (t->ar->regiontype == RGN_TYPE_WINDOW) { - t->zfac = ED_view3d_calc_zfac(t->ar->regiondata, vec, NULL); + t->zfac = ED_view3d_calc_zfac(t->ar->regiondata, t->center_global, NULL); } else { t->zfac = 0.0f; |