Copy ProgramData::uniform_slots in copy constructor and operator=

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

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index c789fe48d0f4c449f628778aac0b1c32f4ecac18..ae98719f16c623f81cc0045bcd4d040f82884129 100644 (file)
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -51,6 +51,7 @@ void EnvironmentMap::setup_frame() const
                camera.set_up_direction(env_tex.get_t_direction(face));
                Renderer env_renderer(&camera);
                env_renderer.exclude(renderable);
+               env_renderer.exclude(*this);
                env_renderer.render(environment);
        }
        Framebuffer::unbind();
@@ -75,7 +76,7 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
        unsigned unit = renderer.allocate_effect_texunit();
        shdata.uniform("environment", static_cast<int>(unit));
-       env_tex.bind_to(unit);
+       Bind _bind_env(env_tex, unit);
 
        const Matrix &view_matrix = renderer.get_camera()->get_matrix();
        // XXX The camera should maybe have store its own object matrix
@@ -93,8 +94,6 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
        renderer.add_shader_data(shdata);
        renderer.render(renderable, tag);
-
-       env_tex.unbind_from(unit);
 }
 
 } // namespace GL