blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Sergey Sharybin 2019-01-08 11:47:35 +01:00
parent f2d2bafe85 1e386d98ce
commit 68b4c57ba5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/intern/makesdna.c
View File

@ -1208,7 +1208,9 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
static void make_bad_file(const char *file, int line)
{
FILE *fp = fopen(file, "w");
fprintf(fp, "#error \"Error! can't make correct DNA.c file from %s:%d, STUPID!\"\n", __FILE__, line);
fprintf(fp,
"#error \"Error! can't make correct DNA.c file from %s:%d, check alignment.\"\n",
__FILE__, line);
fclose(fp);
}

5
source/blender/makesrna/intern/makesrna.c
View File

@ -4054,7 +4054,10 @@ static void rna_generate_header_cpp(BlenderRNA *UNUSED(brna), FILE *f)
static void make_bad_file(const char *file, int line)
{
FILE *fp = fopen(file, "w");
fprintf(fp, "#error \"Error! can't make correct RNA file from %s:%d, STUPID!\"\n", __FILE__, line);
fprintf(fp,
"#error \"Error! can't make correct RNA file from %s:%d, "
"check DNA properties.\"\n",
__FILE__, line);
fclose(fp);
}