Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / texture.cpp

diff --git a/source/texture.cpp b/source/texture.cpp
index e6691b41616b6fc5ca0f297a96655d4a396c9d35..f6594ab14c7e5143434ac0823c862427c70f2c9d 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -226,6 +226,7 @@ void Texture::bind_to(unsigned i) const
        }
 
        TexUnit &unit = TexUnit::get_unit(i);
+       const Texture *cur = unit.get_texture();
        if(unit.set_texture(this))
        {
                if(manager)
@@ -239,7 +240,7 @@ void Texture::bind_to(unsigned i) const
                        glBindTexture(target, id);
                }
 
-               if(!unit.get_sampler())
+               if(!unit.get_sampler() || unit.get_sampler()==&cur->default_sampler)
                        default_sampler.bind_to(i);
        }
 }