GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
This commit is contained in:
Wojtek Figat
2023-04-22 18:59:41 +02:00
parent 644eb35b97 73ff053470
commit 390460907d
51 changed files with 1397 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Render2D/Font.cpp
View File

@@ -211,7 +211,7 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
{
cursorX = lastUpperX;
tmpLine.LastCharIndex = lastUpperIndex - 1;
currentIndex = lastUpperIndex;
currentIndex = lastUpperIndex + 1;
nextCharIndex = currentIndex;
}
else if (lastUnderscoreIndex != INVALID_INDEX)