From 3d02e2854b22a68535aa230656171e83904dacc0 Mon Sep 17 00:00:00 2001 From: Denis Igorevich Lobanov Date: Tue, 17 Jan 2017 09:55:02 +0000 Subject: [PATCH] =?UTF-8?q?Ambiguous=20overload=20for=20=E2=80=98operator?= =?UTF-8?q?=3D=E2=80=99=20#189?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Magnum/AbstractTexture.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index e3f3dad94..cb77e3d9a 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -120,7 +120,7 @@ void AbstractTexture::unbind(const Int textureUnit) { /* Unbind the texture, reset state tracker */ Context::current().state().texture->unbindImplementation(textureUnit); - textureState.bindings[textureUnit] = {}; + textureState.bindings[textureUnit] = {0, 0}; } void AbstractTexture::unbindImplementationDefault(const GLint textureUnit) { @@ -237,7 +237,7 @@ AbstractTexture::~AbstractTexture() { /* Remove all bindings */ for(auto& binding: Context::current().state().texture->bindings) { /* MSVC 2015 needs the parentheses around */ - if(binding.second == _id) binding = {}; + if(binding.second == _id) binding = {0, 0}; } #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)