Merge branch 'master' into asset-experiments

1 files changed, 23 insertions, 1 deletions

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index b07620ebb63..98c2016dc51 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3373,7 +3373,9 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
 	fprintf(f, "#include \"RNA_types.h\"\n");
 	fprintf(f, "#include \"rna_internal.h\"\n\n");
 
-	rna_generate_prototypes(brna, f);
+
+	/* include the generated prototypes header */
+	fprintf(f, "#include \"rna_prototypes_gen.h\"\n\n");
 
 	fprintf(f, "#include \"%s\"\n", filename);
 	if (api_filename)
@@ -3968,6 +3970,26 @@ static int rna_preprocess(const char *outfile)
 
 	status = (DefRNA.error != 0);
 
+	/* create rna prototype header file */
+	strcpy(deffile, outfile);
+	strcat(deffile, "rna_prototypes_gen.h");
+	if (status) {
+		make_bad_file(deffile, __LINE__);
+	}
+	file = fopen(deffile, "w");
+	if (!file) {
+		fprintf(stderr, "Unable to open file: %s\n", deffile);
+		status = 1;
+	}
+	else {
+		fprintf(file,
+		    "/* Automatically generated function declarations for the Data API.\n"
+		    " * Do not edit manually, changes will be overwritten.              */\n\n");
+		rna_generate_prototypes(brna, file);
+		fclose(file);
+		status = (DefRNA.error != 0);
+	}
+
 	/* create rna_gen_*.c files */
 	for (i = 0; PROCESS_ITEMS[i].filename; i++) {
 		strcpy(deffile, outfile);