diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-10-16 18:28:12 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-10-16 18:28:12 +0300 |
| commit | 69713aa2dad3094481c8147d47a985e4d2d9a94f (patch) | |
| tree | 9c0747778f27f081fb1e6a7bb059fd021c7439fb /source/blender/blenfont | |
| parent | b557ceb2c1544d1b5b584a0bf7bb5028b818fd2c (diff) | |
Cleanup: Quiet warnings, use RAD2DEG macro
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 4 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 45d03681c43..1ce4753cc39 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -507,7 +507,7 @@ static void blf_draw_gl__start(FontBLF *font) gpuMatrixBegin3D_legacy(); if (font->flags & BLF_MATRIX) - gpuMultMatrix3D(font->m); + gpuMultMatrix3D((float (*)[4])font->m); gpuTranslate3fv(font->pos); @@ -515,7 +515,7 @@ static void blf_draw_gl__start(FontBLF *font) gpuScale3fv(font->aspect); if (font->flags & BLF_ROTATION) /* radians -> degrees */ - gpuRotateAxis(font->angle * (float)(180.0 / M_PI), 'Z'); + gpuRotateAxis(RAD2DEG(font->angle), 'Z'); float temp_color[4]; glGetFloatv(GL_CURRENT_COLOR, temp_color); /* TODO(merwin): new BLF_color function? */ diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 7cddb46d025..9164a02b2cc 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -175,7 +175,7 @@ typedef struct FontBLF { /* angle in radians. */ float angle; -#if BLF_BLUR_ENABLE +#if 0 /* BLF_BLUR_ENABLE */ /* blur: 3 or 5 large kernel */ int blur; #endif |