[Bf-blender-cvs] [c8ab88fb891] blender2.8: Partially revert "GPUShader: shader.uniform_float parameters"
Campbell Barton
noreply at git.blender.org
Wed Oct 24 09:48:40 CEST 2018
Commit: c8ab88fb89146a6bdc2a8825b9a8e2454aeb1ced
Author: Campbell Barton
Date: Wed Oct 24 17:59:41 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc8ab88fb89146a6bdc2a8825b9a8e2454aeb1ced
Partially revert "GPUShader: shader.uniform_float parameters"
`mathutils_array_parse` is meant to parse 1d arrays of numbers.
Using matrices internal memory layout is confusing since
mathutils matrices are exposed as row major.
Also, the matrix shape wasn't checked for.
Callers that want to handle matrices should check for them explicitly.
===================================================================
M source/blender/python/mathutils/mathutils.c
===================================================================
diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c
index a3e8089c936..07905d2be89 100644
--- a/source/blender/python/mathutils/mathutils.c
+++ b/source/blender/python/mathutils/mathutils.c
@@ -136,9 +136,7 @@ int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *
if ((size = VectorObject_Check(value) ? ((VectorObject *)value)->size : 0) ||
(size = EulerObject_Check(value) ? 3 : 0) ||
(size = QuaternionObject_Check(value) ? 4 : 0) ||
- (size = ColorObject_Check(value) ? 3 : 0) ||
- (size = MatrixObject_Check(value) ? ((MatrixObject *)value)->num_col
- * ((MatrixObject *)value)->num_row : 0))
+ (size = ColorObject_Check(value) ? 3 : 0))
{
if (BaseMath_ReadCallback((BaseMathObject *)value) == -1) {
return -1;
More information about the Bf-blender-cvs
mailing list