diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-03-22 22:23:23 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-03-22 22:23:23 +0300 |
| commit | c2b2f9baa88e6bec9323ee8f2d9d8fc1861aeef5 (patch) | |
| tree | 808e981e3d6d885b814c27660199d1a66ec29b1d /CMakeLists.txt | |
| parent | 243a9254ea579915e697cfde59e9c4f6e9ffd4ee (diff) | |
| parent | edcb5415a275cd121b49972fa8baead4b43cad4d (diff) | |
Merge branch 'blender2.7'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2662859b76d..6a8a7a7fcfa 100644 --- 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 |