diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-09-20 19:11:25 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-09-20 19:11:25 +0300 |
commit | 28da385ac2174856176b633846de6267fb5a96e1 (patch) | |
tree | 110b37d18d4467bcb48c3918220b641b0afb8e84 /source/blender/editors/transform | |
parent | a28a1f11d6fa533b9b12fba28a79bb1df74e218b (diff) |
Cleanup: Use new vector transform functions
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index d8000f03e86..2b295b85da0 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1719,7 +1719,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) glVertex2fv(cent); glEnd(); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glRotatef(-RAD2DEGF(atan2f(cent[0] - t->mval[0], cent[1] - t->mval[1])), 0, 0, 1); setlinestyle(0); @@ -1731,7 +1731,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) case HLP_HARROW: UI_ThemeColor(TH_VIEW_OVERLAY); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); drawArrow(RIGHT, 5, 10, 5); @@ -1741,7 +1741,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) case HLP_VARROW: UI_ThemeColor(TH_VIEW_OVERLAY); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); drawArrow(UP, 5, 10, 5); @@ -1792,7 +1792,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) unsigned char col[3], col2[3]; UI_GetThemeColor3ubv(TH_GRID, col); - glTranslatef(mval[0], mval[1], 0); + glTranslate2fv((const float *)mval); glLineWidth(3.0); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 374a0c3850f..f13bc6b6b55 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -643,7 +643,7 @@ static void test_manipulator_axis(const bContext *C) static float screen_aligned(RegionView3D *rv3d, float mat[4][4]) { - glTranslatef(mat[3][0], mat[3][1], mat[3][2]); + glTranslate3fv(mat[3]); /* sets view screen aligned */ glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]); @@ -923,7 +923,7 @@ static void draw_manipulator_rotate( /* prepare for screen aligned draw */ size = len_v3(rv3d->twmat[0]); glPushMatrix(); - glTranslatef(rv3d->twmat[3][0], rv3d->twmat[3][1], rv3d->twmat[3][2]); + glTranslate3fv(rv3d->twmat[3]); if (arcs) { /* clipplane makes nice handles, calc here because of multmatrix but with translate! */ @@ -1362,7 +1362,7 @@ static void draw_manipulator_translate( manipulator_axis_order(rv3d, axis_order); - // XXX if (moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]); + // XXX if (moving) glTranslate3fv(t->vec); glDisable(GL_DEPTH_TEST); /* center circle, do not add to selection when shift is pressed (planar constraint) */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 7061b8e7603..a7aad427dd6 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -220,7 +220,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t) h = (((float)hi) / IMG_SIZE_FALLBACK) * G.sima->zoom * yuser_asp; cpack(0xFFFFFF); - glTranslatef(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], 0.0f); + glTranslate2fv(t->tsnap.snapPoint); //glRectf(0, 0, 1, 1); |