X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Ftexturing.cpp;h=341cdb79712f6c739ffed027d4ac069f7e04b234;hb=bed45cf18a592f4dc3d899a48610eaea056f69f3;hp=ab5d39b4c42e2b38d51c9ba1dfea5258e851a23a;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/render/texturing.cpp b/source/render/texturing.cpp index ab5d39b4..341cdb79 100644 --- a/source/render/texturing.cpp +++ b/source/render/texturing.cpp @@ -5,6 +5,8 @@ using namespace std; +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + namespace Msp { namespace GL { @@ -136,7 +138,10 @@ void Texturing::bind_attachment(const Attachment &attch) const attch.sampler->bind_to(attch.unit); else Sampler::unbind_from(attch.unit); - attch.texture->bind_to(attch.unit); + if(attch.texture) + attch.texture->bind_to(attch.unit); + else + Texture::unbind_from(attch.unit); } void Texturing::unbind()