16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 04:19:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-10-12 18:50:00 +02:00
4 changed files with 9 additions and 7 deletions

View File

@@ -54,7 +54,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c
// seasonal textures override generic textures
// skip the opening bracket
auto const value { Input.getToken<std::string>( true, "\n\r\t ;" ) };
while( true == deserialize_mapping( Input, 1, Loadnow ) ) {
while( true == deserialize_mapping( Input, Priority + 1, Loadnow ) ) {
; // all work is done in the header
}
}