Merge branch 'blender-v3.1-release'

2022-02-18 15:17:01 -06:00
parent d9d97db018 3cebfadb27
commit 7f68185d34
12 changed files with 43 additions and 48 deletions
--- a/source/blender/gpu/opengl/gl_vertex_array.cc
+++ b/source/blender/gpu/opengl/gl_vertex_array.cc
@@ -54,7 +54,7 @@ static uint16_t vbo_bind(const ShaderInterface *interface,
      const char *name = GPU_vertformat_attr_name_get(format, a, n_idx);
      const ShaderInput *input = interface->attr_get(name);

-      if (input == nullptr) {
+      if (input == nullptr || input->location == -1) {
        continue;
      }