eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-03-11 21:19:53 +01:00
parent 81a6d753e5 d96b259191
commit dd0fa23e11
15 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Texture.cpp
View File

@@ -816,12 +816,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) {
Filename.erase( traitpos );
}
if( ( Filename.rfind( '.' ) != std::string::npos )
&& ( Filename.rfind( '.' ) != Filename.rfind( ".." ) + 1 ) ) {
// trim extension if there's one, but don't mistake folder traverse for extension
Filename.erase( Filename.rfind( '.' ) );
}
erase_extension( Filename );
// change slashes to cross-platform
std::replace(
std::begin( Filename ), std::end( Filename ),