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/blenfont | |
| 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/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 663be49c71e..e6dffedc5d9 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -555,15 +555,15 @@ static void blf_draw_gl__start(FontBLF *font) gpuPushMatrix(); if (font->flags & BLF_MATRIX) - gpuMultMatrix3D(font->m); + gpuMultMatrix(font->m); gpuTranslate3fv(font->pos); if (font->flags & BLF_ASPECT) gpuScale3fv(font->aspect); - if (font->flags & BLF_ROTATION) /* radians -> degrees */ - gpuRotateAxis(RAD2DEG(font->angle), 'Z'); /* TODO: use gpuRotate2D here? */ + if (font->flags & BLF_ROTATION) + gpuRotate2D(RAD2DEG(font->angle)); #ifndef BLF_STANDALONE VertexFormat *format = immVertexFormat(); |