Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / transform / transform.c
index a4bce5b0f1d70c0de106e85151f38db7b342b57b..3aeb38970d2b1c2374c8e392340a49ede7a700e1 100644 (file)
@@ -1707,20 +1707,10 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
        TransInfo *t = (TransInfo *)customdata;
 
        if (t->helpline != HLP_NONE) {
-               float vecrot[3], cent[2];
+               float cent[2];
                float mval[3] = { x, y, 0.0f };
 
-               copy_v3_v3(vecrot, t->center);
-               if (t->flag & T_EDIT) {
-                       Object *ob = t->obedit;
-                       if (ob) mul_m4_v3(ob->obmat, vecrot);
-               }
-               else if (t->flag & T_POSE) {
-                       Object *ob = t->poseobj;
-                       if (ob) mul_m4_v3(ob->obmat, vecrot);
-               }
-
-               projectFloatViewEx(t, vecrot, cent, V3D_PROJ_TEST_CLIP_ZERO);
+               projectFloatViewEx(t, t->center_global, cent, V3D_PROJ_TEST_CLIP_ZERO);
 
                gpuPushMatrix();
 
@@ -2624,7 +2614,7 @@ static void constraintTransLim(TransInfo *t, TransData *td)
        if (td->con) {
                const bConstraintTypeInfo *ctiLoc = BKE_constraint_typeinfo_from_type(CONSTRAINT_TYPE_LOCLIMIT);
                const bConstraintTypeInfo *ctiDist = BKE_constraint_typeinfo_from_type(CONSTRAINT_TYPE_DISTLIMIT);
-
+               
                bConstraintOb cob = {NULL};
                bConstraint *con;
                float ctime = (float)(t->scene->r.cfra);