GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-26 16:02:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2

Browse Source
This commit is contained in:
bubnikv 2019-07-18 17:42:10 +02:00
commit d669a00980
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/SLA/SLAAutoSupports.cpp
View File

@ -386,7 +386,7 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec
} else { } else {
// This is a new cell. // This is a new cell.
PoissonDiskGridEntry data; PoissonDiskGridEntry data;
data.first_sample_idx = i; data.first_sample_idx = int(i);
data.sample_cnt = 1; data.sample_cnt = 1;
auto result = cells.insert({sample.cell_id, data}); auto result = cells.insert({sample.cell_id, data});
last_cell_id = sample.cell_id; last_cell_id = sample.cell_id;

8
src/libslic3r/SLA/SLASupportTreeIGL.cpp
View File

@ -12,10 +12,18 @@
#include "SLABoostAdapter.hpp" #include "SLABoostAdapter.hpp"
#include "boost/geometry/index/rtree.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/ray_mesh_intersect.h>
#include <igl/point_mesh_squared_distance.h> #include <igl/point_mesh_squared_distance.h>
#include <igl/remove_duplicate_vertices.h> #include <igl/remove_duplicate_vertices.h>
#include <igl/signed_distance.h> #include <igl/signed_distance.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <tbb/parallel_for.h> #include <tbb/parallel_for.h>