diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-03-22 00:49:21 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-22 00:49:21 +0300 |
commit | 6d2aca5a96efd8ac61eec633c43a41e641379a68 (patch) | |
tree | de0d38249d8b439bf360ceb8d77f8112d4047f9e /source/blender/editors/transform | |
parent | 7aad5cf573a964753b37573c5a2ea12af5d5952a (diff) |
OpenGL: convert to new matrix API (part 5)
Pretty sure source/blender is now finished, with all legacy matrix calls confined to gpu_matrix.c.
This was the easy part, but doing it first makes the next part much easier. TODO and XXX notes describe what is left.
glMatrixMode is still in place, since the new API does not share this concept of modes. Similar for glOrtho and glFrustum which I'll tackle very soon.
Part of T49450
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 72148ea13b0..3ece7f40b92 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -63,6 +63,7 @@ #include "RNA_access.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" #include "BIK_api.h" @@ -1033,11 +1034,10 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis if (t->spacetype == SPACE_VIEW3D) { View3D *v3d = t->view; - glPushMatrix(); - - //if (t->obedit) glLoadMatrixf(t->obedit->obmat); // sets opengl viewing - - + gpuPushMatrix(); + + // if (t->obedit) gpuLoadMatrix3D(t->obedit->obmat); // sets opengl viewing + copy_v3_v3(v3, dir); mul_v3_fl(v3, v3d->far); @@ -1064,7 +1064,7 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis immUnbindProgram(); - glPopMatrix(); + gpuPopMatrix(); } } |