Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
3d1e978257
|
@ -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
|
||||
|
|
|
@ -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++;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue