Correct last commit
authorCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 09:12:45 +0000 (19:12 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 09:12:55 +0000 (19:12 +1000)
source/blender/makesrna/intern/rna_wm.c

index 8547c50f78e4cb311487b55a5b4e277996cc0929..cb6aebddfba71b6ba7a7bdb54ed01f2df1fdd777 100644 (file)
@@ -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;