fixed merge error

This commit is contained in:
Alexander Eckart committed 2013-05-10 19:47:49 +02:00
1 parent fd7b3ae3a3
commit 166bcb5c43
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -146,6 +146,7 @@ namespace VocaluxeLib
void SetStyle(EStyle fontStyle);
RectangleF GetTextBounds(CText text);
RectangleF GetTextBounds(CText text, float textHeight);
void DrawText(string text, float textHeight, float x, float y, float z, SColorF color);
void DrawTextReflection(string text, float textHeight, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);