Commit 7665aa31 authored by Jan Möbius's avatar Jan Möbius

Fixed indentation warning

parent 4759e4d9
......@@ -502,26 +502,27 @@ void TextureNode::enter(GLState& _state , const DrawModes::DrawMode& _drawmode)
open_volume_mesh_texture_draw_modes_ ))
{
if(_state.compatibilityProfile())
ACG::GLState::enable( GL_TEXTURE_2D );
ACG::GLState::enable( GL_TEXTURE_2D );
mipmapping_globally_active_ = _state.mipmapping_allowed();
// Check if mipmapping status has changed
if(_state.mipmapping_allowed() != last_mipmapping_status_) {
// Update mipmaps
updateMipmaps(mipmapping_globally_active_ && mipmapping_);
// Keep track of changes
last_mipmapping_status_ = _state.mipmapping_allowed();
}
if ( !textures_.empty() ) {
textures_[activeTexture_].tex->bind();
}
if(_state.compatibilityProfile())
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, tex_mode_ );
mipmapping_globally_active_ = _state.mipmapping_allowed();
// Check if mipmapping status has changed
if(_state.mipmapping_allowed() != last_mipmapping_status_) {
// Update mipmaps
updateMipmaps(mipmapping_globally_active_ && mipmapping_);
// Keep track of changes
last_mipmapping_status_ = _state.mipmapping_allowed();
}
if ( !textures_.empty() ) {
textures_[activeTexture_].tex->bind();
}
if(_state.compatibilityProfile())
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, tex_mode_ );
// if (_drawmode & DrawModes::SOLID_FACES_COLORED_2DTEXTURED_FACE_SMOOTH_SHADED)
// glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
......
Markdown is supported
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