Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-10-16 18:28:12 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-10-16 18:28:12 +0300
commit69713aa2dad3094481c8147d47a985e4d2d9a94f (patch)
tree9c0747778f27f081fb1e6a7bb059fd021c7439fb /source/blender/blenfont/intern/blf.c
parentb557ceb2c1544d1b5b584a0bf7bb5028b818fd2c (diff)
Cleanup: Quiet warnings, use RAD2DEG macro
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r--source/blender/blenfont/intern/blf.c4
1 files changed, 2 insertions, 2 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? */