Merge remote-tracking branch 'origin/master' into blender2.8

2018-05-28 14:35:59 -06:00
parent 66577c8732 81060ff6b2
commit 5d1a172783
20 changed files with 151 additions and 18 deletions
--- a/source/blender/python/intern/stubs.c
+++ b/source/blender/python/intern/stubs.c
@@ -32,7 +32,7 @@

 #include "BPY_extern.h"

-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #  pragma GCC diagnostic error "-Wmissing-prototypes"
 #  pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif