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

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

Browse Source 
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
Wojtek Figat
2021-01-22 11:31:22 +01:00
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Platform/Windows/WindowsFileSystem.cpp
View File

@@ -231,7 +231,9 @@ bool WindowsFileSystem::ShowOpenFileDialog(Window* parentWindow, const StringVie
while (*ptr)
{
filenames.Add(directory / ptr);
ptr += (lstrlenW(ptr) + 1);
ptr += lstrlenW(ptr);
if (multiSelect)
ptr++;
}
result = false;
@@ -276,7 +278,9 @@ bool WindowsFileSystem::ShowSaveFileDialog(Window* parentWindow, const StringVie
while (*ptr)
{
filenames.Add(directory / ptr);
ptr += (lstrlenW(ptr) + 1);
ptr += lstrlenW(ptr);
if (multiSelect)
ptr++;
}
result = false;