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

2017-06-07 11:38:03 +02:00 · 2017-06-07 11:38:03 +02:00 · 6fee241db5
parent ce18956d9b 29ace10f7e
commit 6fee241db5
1 changed files with 2 additions and 0 deletions
--- a/source/blender/blenlib/BLI_strict_flags.h
+++ b/source/blender/blenlib/BLI_strict_flags.h
@ -30,6 +30,8 @@
 #ifdef __GNUC__
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406  /* gcc4.6+ only */
 #    pragma GCC diagnostic error "-Wsign-compare"
+#  endif
+#  if __GNUC__ >= 6  /* gcc6+ only */
 #    pragma GCC diagnostic error "-Wconversion"
 #  endif
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408