diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/python/intern/bpy_operator_wrap.c | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/python/intern/bpy_operator_wrap.c')
| -rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 90719905a79..9d57adca946 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -48,10 +48,12 @@ static void operator_properties_init(wmOperatorType *ot) PyTypeObject *py_class = ot->ext.data; RNA_struct_blender_type_set(ot->ext.srna, ot); - /* only call this so pyrna_deferred_register_class gives a useful error - * WM_operatortype_append_ptr will call RNA_def_struct_identifier - * later */ - RNA_def_struct_identifier(ot->srna, ot->idname); + /* Only call this so pyrna_deferred_register_class gives a useful error + * WM_operatortype_append_ptr will call RNA_def_struct_identifier later. + * + * 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); if (pyrna_deferred_register_class(ot->srna, py_class) != 0) { PyErr_Print(); /* failed to register operator props */ |