Merge branch 'master' into blender2.8

1 files changed, 14 insertions, 6 deletions

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 622483f04d6..114ded9b0c0 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -872,9 +872,17 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports, const char *identifi
 	const int len_sep = strlen(sep);
 	const int len_id = strlen(identifier);
 	const char *p = strstr(identifier, sep);
+	/* TODO: make error, for now warning until add-ons update. */
+#if 1
+	const int report_level = RPT_WARNING;
+	const bool failure = true;
+#else
+	const int report_level = RPT_ERROR;
+	const bool failure = false;
+#endif
 	if (p == NULL || p == identifier || p + len_sep >= identifier + len_id) {
-		BKE_reportf(reports, RPT_ERROR, "'%s' doesn't contain '%s' with prefix & suffix", identifier, sep);
-		return false;
+		BKE_reportf(reports, report_level, "'%s' doesn't contain '%s' with prefix & suffix", identifier, sep);
+		return failure;
 	}
 
 	const char *c, *start, *end, *last;
@@ -886,8 +894,8 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports, const char *identifi
 		     ((c != start) && (*c >= '0' && *c <= '9')) ||
 		     ((c != start) && (c != last) && (*c == '_'))) == 0)
 		{
-			BKE_reportf(reports, RPT_ERROR, "'%s' doesn't have upper case alpha-numeric prefix", identifier);
-			return false;
+			BKE_reportf(reports, report_level, "'%s' doesn't have upper case alpha-numeric prefix", identifier);
+			return failure;
 		}
 	}
 
@@ -900,8 +908,8 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports, const char *identifi
 		     (*c >= '0' && *c <= '9') ||
 		     ((c != start) && (c != last) && (*c == '_'))) == 0)
 		{
-			BKE_reportf(reports, RPT_ERROR, "'%s' doesn't have an alpha-numeric suffix", identifier);
-			return false;
+			BKE_reportf(reports, report_level, "'%s' doesn't have an alpha-numeric suffix", identifier);
+			return failure;
 		}
 	}
 	return true;