From 91f1e1ccb5313971fe317b7c9f00619bc401d17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 6 Aug 2019 02:16:34 +0200 Subject: [PATCH] Shaders: fix an assertion in Phong::bindTextures(). Caught by the tests! --- src/Magnum/Shaders/Phong.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp index e204c76f7..6936dbf7a 100644 --- a/src/Magnum/Shaders/Phong.cpp +++ b/src/Magnum/Shaders/Phong.cpp @@ -197,7 +197,7 @@ Phong& Phong::bindNormalTexture(GL::Texture2D& texture) { } Phong& Phong::bindTextures(GL::Texture2D* ambient, GL::Texture2D* diffuse, GL::Texture2D* specular, GL::Texture2D* normal) { - CORRADE_ASSERT(_flags & (Flag::AmbientTexture|Flag::DiffuseTexture|Flag::SpecularTexture, Flag::NormalTexture), + CORRADE_ASSERT(_flags & (Flag::AmbientTexture|Flag::DiffuseTexture|Flag::SpecularTexture|Flag::NormalTexture), "Shaders::Phong::bindTextures(): the shader was not created with any textures enabled", *this); GL::AbstractTexture::bind(AmbientTextureLayer, {ambient, diffuse, specular, normal}); return *this;