diff options
| author | TempoDev <alexia.legrand@epitech.eu> | 2020-09-03 20:37:15 +0300 |
|---|---|---|
| committer | TempoDev <alexia.legrand@epitech.eu> | 2020-09-03 20:37:15 +0300 |
| commit | 1b8bc74b1f93f460a65e255a083f48798834368f (patch) | |
| tree | b63e6b4ac1b6acbc2c9b9d5788645f92704ee763 /extern | |
| parent | 705acb423b54d71a99a8e630774cb3e4888df90f (diff) | |
| parent | 89ed6b12936bc2a89b18cf6dbd7b86e0fbc760d3 (diff) | |
Custom Menus : merge master
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/audaspace/bindings/python/PySound.cpp | 2 | ||||
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extern/mantaflow/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extern/quadriflow/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extern/quadriflow/patches/blender.patch | 12 | ||||
| -rw-r--r-- | extern/quadriflow/src/loader.cpp | 2 |
6 files changed, 16 insertions, 7 deletions
diff --git a/extern/audaspace/bindings/python/PySound.cpp b/extern/audaspace/bindings/python/PySound.cpp index f2debccfd33..33628307249 100644 --- a/extern/audaspace/bindings/python/PySound.cpp +++ b/extern/audaspace/bindings/python/PySound.cpp @@ -2016,7 +2016,7 @@ AUD_API Sound* checkSound(PyObject* sound) bool initializeSound() { - import_array(); + import_array1(false); return PyType_Ready(&SoundType) >= 0; } diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index b386aa4035b..9d0557ded7d 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -419,7 +419,8 @@ if(MSVC) # bullet is responsible for quite a few silly warnings # suppress all of them. Not great, but they really needed # to sort that out themselves. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0") + remove_cc_flag("/W3") + add_c_flag("/W0") endif() blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt index 9f66b42c6bf..8bb0bc69f98 100644 --- a/extern/mantaflow/CMakeLists.txt +++ b/extern/mantaflow/CMakeLists.txt @@ -64,7 +64,6 @@ endif() if(WITH_OPENVDB) add_definitions(-DOPENVDB=1) - add_definitions(-DOPENVDB_STATICLIB) endif() if(WITH_OPENVDB_BLOSC) diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt index bf64e5edb67..e24151d8bf6 100644 --- a/extern/quadriflow/CMakeLists.txt +++ b/extern/quadriflow/CMakeLists.txt @@ -28,9 +28,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") ) endif() -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() diff --git a/extern/quadriflow/patches/blender.patch b/extern/quadriflow/patches/blender.patch index eceda489393..6405a47e262 100644 --- a/extern/quadriflow/patches/blender.patch +++ b/extern/quadriflow/patches/blender.patch @@ -1,3 +1,15 @@ +diff --git a/extern/quadriflow/src/loader.cpp b/extern/quadriflow/src/loader.cpp +--- a/extern/quadriflow/src/loader.cpp ++++ b/extern/quadriflow/src/loader.cpp +@@ -69,7 +69,7 @@ + }; + + /// Hash function for obj_vertex +- struct obj_vertexHash : std::unary_function<obj_vertex, size_t> { ++ struct obj_vertexHash { + std::size_t operator()(const obj_vertex &v) const { + size_t hash = std::hash<uint32_t>()(v.p); + hash = hash * 37 + std::hash<uint32_t>()(v.uv); diff --git a/extern/quadriflow/src/config.hpp b/extern/quadriflow/src/config.hpp index 842b885..bf597ad 100644 --- a/extern/quadriflow/src/config.hpp diff --git a/extern/quadriflow/src/loader.cpp b/extern/quadriflow/src/loader.cpp index aa27066e6e4..a1596eeff9a 100644 --- a/extern/quadriflow/src/loader.cpp +++ b/extern/quadriflow/src/loader.cpp @@ -69,7 +69,7 @@ void load(const char* filename, MatrixXd& V, MatrixXi& F) }; /// Hash function for obj_vertex - struct obj_vertexHash : std::unary_function<obj_vertex, size_t> { + struct obj_vertexHash { std::size_t operator()(const obj_vertex &v) const { size_t hash = std::hash<uint32_t>()(v.p); hash = hash * 37 + std::hash<uint32_t>()(v.uv); |