diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
| commit | 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c (patch) | |
| tree | 02be093686847beb79d430a197ae09b4b1055a69 /source/blender/bmesh | |
| parent | 66577c8732f4957e4afa5cafb18259ea589e74b6 (diff) | |
| parent | 81060ff6b26c22331d2066bb83d492bbe61e936c (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 5245d24a075..320bebc9958 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -169,7 +169,7 @@ set(SRC bmesh_tools.h ) -if(MSVC) +if(MSVC AND NOT MSVC_CLANG) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4101") endif() |