Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2019-01-27 22:18:46 +01:00
2 changed files with 2 additions and 1 deletions

View File

@@ -447,6 +447,7 @@ bool TAnimModel::Load(cParser *parser, bool ter)
std::string name = parser->getToken<std::string>();
std::string texture = parser->getToken<std::string>( false ); // tekstura (zmienia na małe)
replace_slashes( name );
replace_slashes( texture );
if (!Init( name, texture ))
{
if (name != "notload")

View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 27.01.2018, based on milek-0bf7238b, tmj-753cf7ee5"
#define VERSION_INFO "M7 (GL3) 27.01.2018, based on milek-4dc7b3d3d, tmj-753cf7ee5"