[Bf-blender-cvs] [a35aae9e497] master: Correct last commit

Campbell Barton noreply at git.blender.org
Thu Aug 31 11:06:38 CEST 2017


Commit: a35aae9e4972656c0e619c03aa0b26c903d16b34
Author: Campbell Barton
Date:   Thu Aug 31 19:12:45 2017 +1000
Branches: master
https://developer.blender.org/rBa35aae9e4972656c0e619c03aa0b26c903d16b34

Correct last commit

===================================================================

M	source/blender/makesrna/intern/rna_wm.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list