archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPU_matrix: use Blender's naming conventions

Browse Source 
Thanks to @sergey for review
This commit is contained in:
Campbell Barton
2018-07-15 15:27:15 +02:00
parent b457cae397
commit 57ab7daa2a
64 changed files with 495 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenfont/intern/blf.c
View File

@@ -594,24 +594,24 @@ static void blf_draw_gl__start(FontBLF *font)
if ((font->flags & (BLF_ROTATION | BLF_MATRIX | BLF_ASPECT)) == 0)
return; /* glyphs will be translated individually and batched. */
gpuPushMatrix();
GPU_matrix_push();
if (font->flags & BLF_MATRIX)
gpuMultMatrix(font->m);
GPU_matrix_mul(font->m);
gpuTranslate3fv(font->pos);
GPU_matrix_translate_3fv(font->pos);
if (font->flags & BLF_ASPECT)
gpuScale3fv(font->aspect);
GPU_matrix_scale_3fv(font->aspect);
if (font->flags & BLF_ROTATION)
gpuRotate2D(RAD2DEG(font->angle));
GPU_matrix_rotate_2d(RAD2DEG(font->angle));
}
static void blf_draw_gl__end(FontBLF *font)
{
if ((font->flags & (BLF_ROTATION | BLF_MATRIX | BLF_ASPECT)) != 0)
gpuPopMatrix();
GPU_matrix_pop();
}
void BLF_draw_ex(