archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPUShader: shader.uniform_float, matrix parsing

Browse Source 
Add checks to parse 3x3 or 4x4 matrices,
also use error from `mathutils_array_parse` instead of overwriting.
This commit is contained in:
Campbell Barton
2018-10-24 18:45:47 +11:00
parent c8ab88fb89
commit 0589368615
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/gpu/gpu_py_shader.c
View File

@@ -450,8 +450,24 @@ static PyObject *bpygpu_shader_uniform_float(
values[0] = (float)PyLong_AsDouble(params.seq);
length = 1;
}
else if (MatrixObject_Check(params.seq)) {
MatrixObject *mat = (MatrixObject *)params.seq;
if (BaseMath_ReadCallback(mat) == -1) {
return NULL;
}
if ((mat->num_row != mat->num_col) || !ELEM(mat->num_row, 3, 4)) {
PyErr_SetString(PyExc_ValueError,
"Expected 3x3 or 4x4 matrix");
return NULL;
}
length = mat->num_row * mat->num_col;
memcpy(values, mat->matrix, sizeof(float) * length);
}
else {
length = mathutils_array_parse(values, 2, 16, params.seq, "");
if (length == -1) {
return NULL;
}
}
if (!ELEM(length, 1, 2, 3, 4, 9, 16)) {