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:
authorMike Erwin <significant.bit@gmail.com>2015-12-14 05:19:45 +0300
committerMike Erwin <significant.bit@gmail.com>2015-12-15 06:28:12 +0300
commit87fac9a81623d4856e5325718501423abfbcbbe5 (patch)
treeee27d9e847d5038e31c318a9618a161c0966f4ae /source/blender/blenfont
parent17a16b57df2d6e45c2f9e0d937c7baf8a386764b (diff)
use float (not double) for font matrix
Following up on recent double --> float commits in the game engine.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/BLF_api.h2
-rw-r--r--source/blender/blenfont/intern/blf.c4
-rw-r--r--source/blender/blenfont/intern/blf_internal_types.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 9527c4edcf0..e565ffe3cc1 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -73,7 +73,7 @@ void BLF_size(int fontid, int size, int dpi);
* | m[3] m[7] m[11] m[15] |
*
*/
-void BLF_matrix(int fontid, const double m[16]);
+void BLF_matrix(int fontid, const float m[16]);
/* Draw the string using the default font, size and dpi. */
void BLF_draw_default(float x, float y, float z, const char *str, size_t len) ATTR_NONNULL();
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 6c3fd090d4a..a387b26ec3e 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -384,7 +384,7 @@ void BLF_aspect(int fontid, float x, float y, float z)
}
}
-void BLF_matrix(int fontid, const double m[16])
+void BLF_matrix(int fontid, const float m[16])
{
FontBLF *font = blf_get(fontid);
@@ -511,7 +511,7 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode)
glPushMatrix();
if (font->flags & BLF_MATRIX)
- glMultMatrixd((GLdouble *)&font->m);
+ glMultMatrixf(font->m);
glTranslate3fv(font->pos);
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index f17401a9991..0fac576a8cc 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -194,7 +194,7 @@ typedef struct FontBLF {
/* Multiplied this matrix with the current one before
* draw the text! see blf_draw__start.
*/
- double m[16];
+ float m[16];
/* clipping rectangle. */
rctf clip_rec;