diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:38 +0300 |
| commit | 323a7ab944132335f27ba21519df161d7a3351c9 (patch) | |
| tree | ebccd8e52bcead21faaadbcf4c427293e598061c /source/blender/makesrna/intern/rna_wm.c | |
| parent | 480def9c5587b710ce478a58985e2e4359c14467 (diff) | |
| parent | a35aae9e4972656c0e619c03aa0b26c903d16b34 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index b0b44604751..e4b5d31dbdd 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1246,18 +1246,21 @@ static StructRNA *rna_Operator_register( if (ot && ot->ext.srna) rna_Operator_unregister(bmain, ot->ext.srna); } - if (!RNA_struct_available_or_report(reports, identifier)) { + + if (!WM_operator_py_idname_ok_or_report(reports, identifier, dummyot.idname)) { return NULL; } - if (!WM_operator_py_idname_ok_or_report(reports, identifier, temp_buffers.idname)) { + + char idname_conv[sizeof(dummyop.idname)]; + WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */ + + if (!RNA_struct_available_or_report(reports, idname_conv)) { return NULL; } /* Convert foo.bar to FOO_OT_bar * allocate all strings at once. */ { - char idname_conv[sizeof(dummyop.idname)]; - WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */ const char *strings[] = { idname_conv, temp_buffers.name, @@ -1384,18 +1387,21 @@ static StructRNA *rna_MacroOperator_register( if (ot && ot->ext.srna) rna_Operator_unregister(bmain, ot->ext.srna); } - if (!RNA_struct_available_or_report(reports, identifier)) { + + if (!WM_operator_py_idname_ok_or_report(reports, identifier, dummyot.idname)) { return NULL; } - if (!WM_operator_py_idname_ok_or_report(reports, identifier, temp_buffers.idname)) { + + char idname_conv[sizeof(dummyop.idname)]; + WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */ + + if (!RNA_struct_available_or_report(reports, idname_conv)) { return NULL; } /* Convert foo.bar to FOO_OT_bar * allocate all strings at once. */ { - char idname_conv[sizeof(dummyop.idname)]; - WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */ const char *strings[] = { idname_conv, temp_buffers.name, |