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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-09-05 22:56:03 +10:00
parent 7dfcbe01b0 4d85396fe4
commit 572b1a644f
29 changed files with 348 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/bmesh/bmesh_py_ops_call.c
View File

@@ -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);

2
source/blender/python/intern/bpy_operator_wrap.c
View File

@@ -53,7 +53,7 @@ static void operator_properties_init(wmOperatorType *ot)
*
* Note the 'no_struct_map' function is used since the actual struct name is already used by the operator.
*/
RNA_def_struct_identifier(&BLENDER_RNA, ot->srna, ot->idname);
RNA_def_struct_identifier_no_struct_map(ot->srna, ot->idname);
if (pyrna_deferred_register_class(ot->srna, py_class) != 0) {
PyErr_Print(); /* failed to register operator props */