diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 12:12:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 12:12:55 +0300 |
| commit | a35aae9e4972656c0e619c03aa0b26c903d16b34 (patch) | |
| tree | eb0fd75ce688c40b731bfac42f8a87729c46b4b5 | |
| parent | 732f70a151c47dc55e9da33c0bf346764bb54ab6 (diff) | |
Correct last commit
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 8547c50f78e..cb6aebddfba 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1154,14 +1154,15 @@ 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; } char idname_conv[sizeof(dummyop.idname)]; - WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */ + WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */ - if (!WM_operator_py_idname_ok_or_report(reports, idname_conv, temp_buffers.idname)) { + if (!RNA_struct_available_or_report(reports, idname_conv)) { return NULL; } @@ -1295,12 +1296,12 @@ static StructRNA *rna_MacroOperator_register( rna_Operator_unregister(bmain, ot->ext.srna); } - if (!WM_operator_py_idname_ok_or_report(reports, identifier, temp_buffers.idname)) { + if (!WM_operator_py_idname_ok_or_report(reports, identifier, dummyot.idname)) { return NULL; } char idname_conv[sizeof(dummyop.idname)]; - WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */ + WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */ if (!RNA_struct_available_or_report(reports, idname_conv)) { return NULL; |