diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
commit | 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c (patch) | |
tree | 02be093686847beb79d430a197ae09b4b1055a69 /source/blender/makesrna | |
parent | 66577c8732f4957e4afa5cafb18259ea589e74b6 (diff) | |
parent | 81060ff6b26c22331d2066bb83d492bbe61e936c (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 1c55925809a..80d1897f604 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3482,7 +3482,7 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const /* we want the included C files to have warnings enabled but for the generated code * ignore unused-parameter warnings which are hard to prevent */ -#ifdef __GNUC__ +#if defined( __GNUC__) || defined(__clang__) fprintf(f, "#pragma GCC diagnostic ignored \"-Wunused-parameter\"\n\n"); #endif |