Merge branch 'master' into blender2.8

6 files changed, 24 insertions, 21 deletions

diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index 6bd04fda3d2..7bfa05417ca 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -274,7 +274,7 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, ReportList *reports, v
 	if (ksi && ksi->ext.srna) {
 		rna_KeyingSetInfo_unregister(bmain, ksi->ext.srna);
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummyksi.idname)) {
 		return NULL;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 45549e4007f..294c40d4094 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -637,7 +637,7 @@ static StructRNA *rna_NodeTree_register(
 	if (nt) {
 		rna_NodeTree_unregister(bmain, nt->ext.srna);
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
 		return NULL;
 	}
 
@@ -1397,16 +1397,13 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc
 		            identifier, (int)sizeof(dummynt.idname));
 		return NULL;
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
-		return NULL;
-	}
 
 	/* check if we have registered this node type before, and remove it */
 	nt = nodeTypeFind(dummynt.idname);
 	if (nt) {
 		rna_Node_unregister(bmain, nt->ext.srna);
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
 		return NULL;
 	}
 	
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index b5115aa3978..0a6ed2e1ea2 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -341,7 +341,7 @@ static StructRNA *rna_RenderEngine_register(Main *bmain, ReportList *reports, vo
 			break;
 		}
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummyet.idname)) {
 		return NULL;
 	}
 	
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 0fc0739f860..84e446ef330 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -229,7 +229,7 @@ static StructRNA *rna_Panel_register(Main *bmain, ReportList *reports, void *dat
 			break;
 		}
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummypt.idname)) {
 		return NULL;
 	}
 	
@@ -494,7 +494,7 @@ static StructRNA *rna_UIList_register(Main *bmain, ReportList *reports, void *da
 	if (ult && ult->ext.srna) {
 		rna_UIList_unregister(bmain, ult->ext.srna);
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummyult.idname)) {
 		return NULL;
 	}
 
@@ -599,7 +599,7 @@ static StructRNA *rna_Header_register(Main *bmain, ReportList *reports, void *da
 			break;
 		}
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummyht.idname)) {
 		return NULL;
 	}
 	
@@ -725,7 +725,7 @@ static StructRNA *rna_Menu_register(Main *bmain, ReportList *reports, void *data
 	if (mt && mt->ext.srna) {
 		rna_Menu_unregister(bmain, mt->ext.srna);
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummymt.idname)) {
 		return NULL;
 	}
 	
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,
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c
index 8b1e681f227..3e04a0a8233 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -468,7 +468,7 @@ static StructRNA *rna_Manipulator_register(
 			rna_Manipulator_unregister(bmain, wt->ext.srna);
 		}
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummywt.idname)) {
 		return NULL;
 	}
 
@@ -773,7 +773,7 @@ static StructRNA *rna_ManipulatorGroup_register(
 			rna_ManipulatorGroup_unregister(bmain, wgt->ext.srna);
 		}
 	}
-	if (!RNA_struct_available_or_report(reports, identifier)) {
+	if (!RNA_struct_available_or_report(reports, dummywgt.idname)) {
 		return NULL;
 	}