Changeset 9140 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/material.h

Timestamp:

Jul 4, 2006, 3:06:00 PM (18 years ago)

Author:

bensch

Message:

merged back

File:

• branches/terrain/src/lib/graphics/importer/material.h (modified) (1 diff)

branches/terrain/src/lib/graphics/importer/material.h

@@ -61 +61 @@
   void setSpecularMap(const std::string& sMap, GLenum target = GL_TEXTURE_2D);
   void setBump(const std::string& bump);
-
   GLuint diffuseTextureID(unsigned int i = 0) const { return (this->textures.size() > i)? this->textures[i].getTexture() : 0; };