diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-04-15 08:29:25 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-15 08:29:56 +0300 |
commit | 4b043994e8795f37e9227362fe24fd66d45c6b39 (patch) | |
tree | 921b417669349cc5cc592634bf7b304a4f3820de /source/blender/editors/transform | |
parent | ff3942505a8d861d0024ce4e95bd80da6ee303de (diff) |
GPU Matrix API: clean up after 2D-3D unification
See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API.
- remove unused functions, defines, enums, comments
- remove "3D" from function names
- init to Identity transform (otherwise empty stack)
- gpuMatrixReset lets outside code return to initial state
Part of T49450
Follow up to D2626 and 49fc9cff3b90
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c479203bbeb..06a052ad711 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -6858,7 +6858,7 @@ static void drawEdgeSlide(TransInfo *t) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); gpuPushMatrix(); - gpuMultMatrix3D(t->obedit->obmat); + gpuMultMatrix(t->obedit->obmat); unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 3, KEEP_FLOAT); @@ -7470,7 +7470,7 @@ static void drawVertSlide(TransInfo *t) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); gpuPushMatrix(); - gpuMultMatrix3D(t->obedit->obmat); + gpuMultMatrix(t->obedit->obmat); glLineWidth(line_size); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index d9dc6bf0dfd..0009ae13117 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1036,7 +1036,7 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis gpuPushMatrix(); - // if (t->obedit) gpuLoadMatrix3D(t->obedit->obmat); // sets opengl viewing + // if (t->obedit) gpuLoadMatrix(t->obedit->obmat); // sets opengl viewing copy_v3_v3(v3, dir); mul_v3_fl(v3, v3d->far); |