Permalink
Browse files

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

  • Loading branch information...
2 parents 89d8a19 + d6c983c commit 28737270d93a5ee110a14ca8dcfcbcbc7294f542 @hiker hiker committed Jun 10, 2014
Showing with 3 additions and 1 deletion.
  1. +1 −1 src/graphics/material.cpp
  2. +2 −0 src/graphics/material.hpp
@@ -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 );
@@ -224,6 +224,8 @@ class Material : public NoCopy
/** 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);

0 comments on commit 2873727

Please sign in to comment.