X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.cpp;h=45ed6af7b579e2071209590864535d474b1ae7f6;hp=448db60a91f967cca6362a2ad9e5c41ff5afdc68;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hpb=67538c60b8baa6816b8ae2d343ae62d881e6c58d diff --git a/source/renderpass.cpp b/source/renderpass.cpp index 448db60a..45ed6af7 100644 --- a/source/renderpass.cpp +++ b/source/renderpass.cpp @@ -6,7 +6,6 @@ #include "program.h" #include "programdata.h" #include "renderer.h" -#include "texenv.h" #include "texture.h" #include "texture2d.h" #include "texturing.h" @@ -151,22 +150,11 @@ void RenderPass::TextureLoader::finish() { if(tex) { - if(env) - obj.attach(index, *tex, *env); - else - obj.attach(index, *tex); + obj.attach(index, *tex); tex.release(); - env.release(); } } -void RenderPass::TextureLoader::texenv() -{ - throw runtime_error("TexEnvs can't be loaded yet"); - /*env = new TexEnv; - load_sub(*env);*/ -} - void RenderPass::TextureLoader::texture(const string &name) { tex = &get_collection().get(name);