Merge branch 'blender-v3.1-release'

2022-02-14 18:01:52 -06:00
parent 89b47c1214 1f7f7ca14e
commit 3d1e978257
2 changed files with 20 additions and 1 deletions
--- a/source/blender/gpu/opengl/gl_shader_interface.cc
+++ b/source/blender/gpu/opengl/gl_shader_interface.cc
@@ -397,7 +397,9 @@ GLShaderInterface::GLShaderInterface(GLuint program, const shader::ShaderCreateI
    else {
      input->location = input->binding = attr.index;
    }
-    enabled_attr_mask_ |= (1 << input->location);
+    if (input->location != -1) {
+      enabled_attr_mask_ |= (1 << input->location);
+    }
    input++;
  }