Merge branch 'master' of ssh://holtrop.homelinux.com/wfobj

This commit is contained in:
Josh Holtrop 2011-05-04 20:38:53 -04:00
commit 1c17d3b398

View File

@ -74,6 +74,7 @@ public:
void bindBuffers();
size_t getNumMaterials() { return m_num_materials; }
std::map<std::string, Material> & getMaterials() { return m_materials; }
bool doTextures() { return m_do_textures; }
protected:
/* types */