[Bf-blender-cvs] [85d53620aa6] master: Cleanup: avoid confusing assignment

Campbell Barton noreply at git.blender.org
Mon Sep 4 06:28:23 CEST 2017


Commit: 85d53620aa698029c83c9b596dbd4dcc8bb5c6da
Author: Campbell Barton
Date:   Mon Sep 4 14:23:39 2017 +1000
Branches: master
https://developer.blender.org/rB85d53620aa698029c83c9b596dbd4dcc8bb5c6da

Cleanup: avoid confusing assignment

===================================================================

M	source/blender/python/bmesh/bmesh_py_ops_call.c

===================================================================

diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c
index f3fe4ff29e4..6598d402f72 100644
--- a/source/blender/python/bmesh/bmesh_py_ops_call.c
+++ b/source/blender/python/bmesh/bmesh_py_ops_call.c
@@ -200,12 +200,12 @@ static int bpy_slot_from_py(
 		{
 			/* XXX - BMesh operator design is crappy here, operator slot should define matrix size,
 			 * not the caller! */
-			unsigned short size;
 			MatrixObject *pymat;
 			if (!Matrix_ParseAny(value, &pymat)) {
 				return -1;
 			}
-			if (((size = pymat->num_col) != pymat->num_row) || (!ELEM(size, 3, 4))) {
+			const ushort size = pymat->num_col;
+			if ((size != pymat->num_row) || (!ELEM(size, 3, 4))) {
 				PyErr_Format(PyExc_TypeError,
 				             "%.200s: keyword \"%.200s\" expected a 3x3 or 4x4 matrix Matrix",
 				             opname, slot_name);



More information about the Bf-blender-cvs mailing list