Merge branch 'milek-dev' into gfx-work

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

View File

@@ -182,7 +182,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
}
}