Commit: cb44ed76ed119206c0db912398a5d7a9a2f9c7cd
Author: mattoverby
Date: Wed Aug 12 23:57:12 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rBcb44ed76ed119206c0db912398a5d7a9a2f9c7cd
fixed compile error omp
===================================================================
M extern/discregrid/discregrid/src/geometry/mesh_distance.cpp
===================================================================
diff --git a/extern/discregrid/discregrid/src/geometry/mesh_distance.cpp
b/extern/discregrid/discregrid/src/geometry/mesh_distance.cpp
index e54488371e3..297fcffb3b5 100755
--- a/extern/discregrid/discregrid/src/geometry/mesh_distance.cpp
+++ b/extern/discregrid/discregrid/src/geometry/mesh_distance.cpp
@@ -5,6 +5,7 @@
#include <limits>
#include <functional>
+#include <thread>
//#include <omp.h>
using namespace Eigen;
@@ -16,7 +17,7 @@ MeshDistance::MeshDistance(TriangleMesh const& mesh, bool
precompute_normals)
: m_bsh(mesh.vertex_data(), mesh.face_data()), m_mesh(mesh),
thread_map(nullptr)
, m_precomputed_normals(precompute_normals)
{
- auto max_threads = omp_get_max_threads();
+ auto max_threads = std::max(1,(int)std::thread::hardware_concurrency());
m_queues.resize(max_threads);
m_nearest_face.resize(max_threads);
m_cache.resize(max_threads, FunctionValueCache([&](Vector3d const& xi){
return signedDistance(xi);}, 10000u));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
