diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-15 03:01:52 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-15 03:01:52 +0300 |
commit | 3d1e97825712bdaadf4038ba99fa7a0a87f7294c (patch) | |
tree | 9875b91090d98ba4d4745cc13180216c45b32d5c | |
parent | 89b47c121449c1e2e54470e71c7146222311951d (diff) | |
parent | 1f7f7ca14e50be457810efb109a03d98f78726fc (diff) |
Merge branch 'blender-v3.1-release'
-rw-r--r-- | source/blender/editors/space_spreadsheet/spreadsheet_layout.cc | 17 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_shader_interface.cc | 4 |
2 files changed, 20 insertions, 1 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index ad8778b5cb0..33fd7329e6d 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -255,6 +255,23 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { } } } + else if (data.type().is<std::string>()) { + uiDefIconTextBut(params.block, + UI_BTYPE_LABEL, + 0, + ICON_NONE, + data.get<std::string>(real_index).c_str(), + params.xmin, + params.ymin, + params.width, + params.height, + nullptr, + 0, + 0, + 0, + 0, + nullptr); + } } void draw_float_vector(const CellDrawParams ¶ms, const Span<float> values) const diff --git a/source/blender/gpu/opengl/gl_shader_interface.cc b/source/blender/gpu/opengl/gl_shader_interface.cc index 65235cfa88b..f6a7eee80c3 100644 --- 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++; } |