Merge branch 'master' into blender2.8

2018-09-26 10:28:23 +10:00
parent c29d18c4c8 fcf3aa90da
commit c72380a427
3 changed files with 5 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1454,6 +1454,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		"/wd4305"  # truncation from 'type1' to 'type2'
 		"/wd4800"  # forcing value to bool 'true' or 'false'
 		"/wd4828"  # The file contains a character that is illegal
+		"/wd4996"  # identifier was declared deprecated
 		# errors:
 		"/we4013"  # 'function' undefined; assuming extern returning int
 		"/we4133"  # incompatible pointer types