Merge branch 'master' of github.com:supertuxkart/stk-code

src/graphics/material.cpp

@@ -137,7 +137,7 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
     node->get("fog",              &m_fog               );
 
     node->get("mask",             &m_mask              );
-
+    node->get("gloss-map",        &m_gloss_map         );
     node->get("water-splash",     &m_water_splash      );
     node->get("jump",             &m_is_jump_texture   );
     node->get("has-gravity",      &m_has_gravity       );

src/graphics/material.hpp

@@ -224,6 +224,8 @@ private:
     /** If m_splatting is true, indicates the fourth splatting texture */
     std::string      m_splatting_texture_4;
 
+    std::string      m_gloss_map;
+
     bool  m_deprecated;
 
     void  init    (unsigned int index);