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-01 02:30:48 +10:00
parent 323a7ab944 0bbae3f3f6
commit c843e84892
21 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_no_struct_map(ot->srna, ot->idname);
RNA_def_struct_identifier(&BLENDER_RNA, ot->srna, ot->idname);
if (pyrna_deferred_register_class(ot->srna, py_class) != 0) {
PyErr_Print(); /* failed to register operator props */

10
source/blender/python/intern/bpy_rna.c
View File

@@ -6965,15 +6965,7 @@ static PyObject *pyrna_basetype_dir(BPy_BaseTypeRNA *self)
RNA_PROP_BEGIN (&self->ptr, itemptr, self->prop)
{
StructRNA *srna = itemptr.data;
StructRNA *srna_base = RNA_struct_base(itemptr.data);
/* skip own operators, these double up [#29666] */
if (ELEM(srna_base, &RNA_Operator, &RNA_Manipulator)) {
/* do nothing */
}
else {
/* add to python list */
PyList_APPEND(ret, PyUnicode_FromString(RNA_struct_identifier(srna)));
}
PyList_APPEND(ret, PyUnicode_FromString(RNA_struct_identifier(srna)));
}
RNA_PROP_END;