X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;fp=source%2Fcore%2Ftexture.cpp;h=be825e7ff231f118356897dcc6036365c178be32;hb=57ca8f2bd18525d80ed6ad5d3f72e57901162d55;hp=85f5fb5836ebdcdb56af17191343a9c2f21be9ea;hpb=5a01404e40717c6c2cc389ed8357713e1f216f07;p=libs%2Fgl.git diff --git a/source/core/texture.cpp b/source/core/texture.cpp index 85f5fb58..be825e7f 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -9,7 +9,7 @@ namespace Msp { namespace GL { Texture::Texture(unsigned t, ResourceManager *m): - TextureBackend(t, !m), + TextureBackend(t), format(NO_PIXELFORMAT), storage_fmt(format), swizzle(NO_SWIZZLE), @@ -122,11 +122,7 @@ void Texture::Loader::generate_mipmap(bool gm) void Texture::Loader::image_data(const string &data) { if(obj.manager) - { obj.set_manager(0); - if(!obj.id) - obj.generate_id(); - } Graphics::Image img; IO::Memory mem(data.data(), data.size());