Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-10-10 11:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master'

Browse Source 
Conflicts:
	examples/common/font/text_buffer_manager.cpp
This commit is contained in:
Jeremie Roy
2013-05-22 17:22:48 +02:00
parent 3df72de750 aeb414d238
commit 65b08cc523
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/common/font/text_buffer_manager.cpp
View File

@@ -261,7 +261,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const wchar_t* _string, cons
}
if( _end == NULL)
{
_end = _string + wcslen(_string);
_end = _string + (uint32_t) wcslen(_string);
}
BX_CHECK(_end >= _string);