From c942e3e7641a2845fcfe14f6505f3debdc81cfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 18 Jun 2021 20:03:26 +0200 Subject: [PATCH] Shaders: Bitangent is disallowed only with InstancedObjectId. With just ObjectId it's fine. Sorry for a silly breakage! --- src/Magnum/Shaders/PhongGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 57723011f..3cd3a1aa0 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -91,7 +91,7 @@ PhongGL::PhongGL(const Flags flags, const UnsignedInt lightCount "Shaders::PhongGL: texture transformation enabled but the shader is not textured", ); #ifndef MAGNUM_TARGET_GLES2 - CORRADE_ASSERT(!(flags & Flag::InstancedObjectId) || !(flags & Flag::Bitangent), + CORRADE_ASSERT(!(flags >= Flag::InstancedObjectId) || !(flags & Flag::Bitangent), "Shaders::PhongGL: Bitangent attribute binding conflicts with the ObjectId attribute, use a Tangent4 attribute with instanced object ID rendering instead", ); #endif