Merge branch 'blender2.7'

Conflicts: CMakeLists.txt
2019-03-22 16:23:23 -03:00
parent 243a9254ea edcb5415a2
commit c2b2f9baa8
1 changed files with 1 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1446,6 +1446,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		# warning level:
 		"/W3"
 		"/w34062"  # switch statement contains 'default' but no 'case' labels
+		"/w34115"  # 'type' : named type definition in parentheses
 		"/w34189"  # local variable is initialized but not referenced
 		# disable:
 		"/wd4018"  # signed/unsigned mismatch