Commit 16d8de31 authored by Jan Möbius's avatar Jan Möbius
Browse files

Enable textures in shader mode

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6109 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 74d954a0
......@@ -436,7 +436,8 @@ void TextureNode::enter(GLState& /* _state */ , unsigned int _drawmode)
DrawModes::SOLID_TEXTURED_SHADED |
DrawModes::SOLID_ENV_MAPPED |
DrawModes::SOLID_2DTEXTURED_FACE |
DrawModes::SOLID_2DTEXTURED_FACE_SHADED ))
DrawModes::SOLID_2DTEXTURED_FACE_SHADED |
DrawModes::SOLID_SHADER))
{
glEnable( GL_TEXTURE_2D );
if ( !textures_.empty() ) {
......@@ -456,7 +457,8 @@ void TextureNode::leave(GLState& /* _state */ , unsigned int _drawmode)
DrawModes::SOLID_TEXTURED_SHADED |
DrawModes::SOLID_ENV_MAPPED |
DrawModes::SOLID_2DTEXTURED_FACE |
DrawModes::SOLID_2DTEXTURED_FACE_SHADED ))
DrawModes::SOLID_2DTEXTURED_FACE_SHADED |
DrawModes::SOLID_SHADER))
{
glBindTexture( GL_TEXTURE_2D, 0 );
glDisable( GL_TEXTURE_2D );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment