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:
Diffstat (limited to 'source/blender/ftfont/intern/FTF_Api.cpp')
-rw-r--r--source/blender/ftfont/intern/FTF_Api.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/ftfont/intern/FTF_Api.cpp b/source/blender/ftfont/intern/FTF_Api.cpp
index 40d904b253f..46638d9f4eb 100644
--- a/source/blender/ftfont/intern/FTF_Api.cpp
+++ b/source/blender/ftfont/intern/FTF_Api.cpp
@@ -132,14 +132,14 @@ FTF_EXPORT void FTF_GetBoundingBox(char* str, float *llx, float *lly, float *llz
/**
* added by phase
- *
+ * changed by ton; to allow both file load as memory load (datasize!=0)
*/
-FTF_EXPORT int FTF_SetFont(char* str, int size)
+FTF_EXPORT int FTF_SetFont(const unsigned char* str, int datasize, int fontsize)
{
- return _FTF_GetFont()->SetFont(str, size);
+ return _FTF_GetFont()->SetFont(str, datasize, fontsize);
}
-/* added bt ton */
+/* added by ton */
FTF_EXPORT void FTF_SetFontSize(char size)
{