Merge remote-tracking branch 'main/Preview4_0' into Preview4_0

This commit is contained in:
Robert MacGregor 2021-08-14 14:36:49 -04:00
commit 3c61538811
514 changed files with 29 additions and 22 deletions

View file

@ -1284,7 +1284,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
bool Platform::dumpDirectories(const char *path, Vector<StringTableEntry> &directoryVector, S32 depth, bool noBasePath)
{
bool retVal = recurseDumpDirectories(path, "", directoryVector, 0, depth, noBasePath);
bool retVal = recurseDumpDirectories(path, "", directoryVector, -1, depth, noBasePath);
clearExcludedDirectories();
return retVal;
}

View file

@ -96,6 +96,13 @@ bool Platform::displaySplashWindow( String path )
SDL_RenderCopy(gSplashRenderer, gSplashTexture, NULL, NULL);
SDL_RenderPresent(gSplashRenderer);
SDL_DestroyTexture(gSplashTexture);
gSplashTexture = nullptr;
SDL_DestroyRenderer(gSplashRenderer);
gSplashRenderer = nullptr;
}
return true;

View file

Before

Width:  |  Height:  |  Size: 659 KiB

After

Width:  |  Height:  |  Size: 659 KiB

Some files were not shown because too many files have changed in this diff Show more