diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2019-07-18 17:32:04 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-07-18 17:32:04 +0300 |
commit | 76b1fbc5bf7ae42a0ea826afc6a6d5ae070f32ec (patch) | |
tree | 50277c4739f162a048beeed64b5b33cc27410814 /src/libslic3r/SLA | |
parent | 44d7462bdb4194a7df2837e3686434b92a1ea668 (diff) |
Eliminate some igl warnings on msvc
Diffstat (limited to 'src/libslic3r/SLA')
-rw-r--r-- | src/libslic3r/SLA/SLAAutoSupports.cpp | 2 | ||||
-rw-r--r-- | src/libslic3r/SLA/SLASupportTreeIGL.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libslic3r/SLA/SLAAutoSupports.cpp b/src/libslic3r/SLA/SLAAutoSupports.cpp index 91b7dfe5d..78efd0806 100644 --- a/src/libslic3r/SLA/SLAAutoSupports.cpp +++ b/src/libslic3r/SLA/SLAAutoSupports.cpp @@ -386,7 +386,7 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec } else { // This is a new cell. PoissonDiskGridEntry data; - data.first_sample_idx = i; + data.first_sample_idx = int(i); data.sample_cnt = 1; auto result = cells.insert({sample.cell_id, data}); last_cell_id = sample.cell_id; diff --git a/src/libslic3r/SLA/SLASupportTreeIGL.cpp b/src/libslic3r/SLA/SLASupportTreeIGL.cpp index 4b6498a20..d48b5bf73 100644 --- a/src/libslic3r/SLA/SLASupportTreeIGL.cpp +++ b/src/libslic3r/SLA/SLASupportTreeIGL.cpp @@ -12,10 +12,18 @@ #include "SLABoostAdapter.hpp" #include "boost/geometry/index/rtree.hpp" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4244) +#pragma warning(disable: 4267) +#endif #include <igl/ray_mesh_intersect.h> #include <igl/point_mesh_squared_distance.h> #include <igl/remove_duplicate_vertices.h> #include <igl/signed_distance.h> +#ifdef _MSC_VER +#pragma warning(pop) +#endif #include <tbb/parallel_for.h> |