forked from pool/cura-engine
32 lines
2.3 KiB
Diff
32 lines
2.3 KiB
Diff
|
--- src/layerPart.cpp.orig 2019-06-13 09:15:37.518080499 +0200
|
||
|
+++ src/layerPart.cpp 2019-06-13 09:16:33.375602117 +0200
|
||
|
@@ -52,7 +52,7 @@
|
||
|
{
|
||
|
const auto total_layers = slicer->layers.size();
|
||
|
assert(mesh.layers.size() == total_layers);
|
||
|
-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic)
|
||
|
+#pragma omp parallel for default(none) shared(mesh, slicer, total_layers) schedule(dynamic)
|
||
|
// Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
|
||
|
for (int layer_nr = 0; layer_nr < static_cast<int>(total_layers); layer_nr++)
|
||
|
{
|
||
|
--- ./src/support.cpp.orig 2019-06-13 09:15:37.518080499 +0200
|
||
|
+++ ./src/support.cpp 2019-06-13 09:18:54.823456474 +0200
|
||
|
@@ -868,7 +868,7 @@
|
||
|
constexpr bool no_prime_tower = false;
|
||
|
xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).offset(xy_distance);
|
||
|
// for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area
|
||
|
- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
|
||
|
+ #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh, layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) schedule(dynamic)
|
||
|
// Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
|
||
|
for (int layer_idx = 1; layer_idx < static_cast<int>(layer_count); layer_idx++)
|
||
|
{
|
||
|
@@ -1065,7 +1065,7 @@
|
||
|
const int max_checking_layer_idx = std::max(0,
|
||
|
std::min(static_cast<int>(storage.support.supportLayers.size()),
|
||
|
static_cast<int>(layer_count - (layer_z_distance_top - 1))));
|
||
|
-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
|
||
|
+#pragma omp parallel for default(none) shared(support_areas, storage, max_checking_layer_idx, layer_z_distance_top) schedule(dynamic)
|
||
|
// Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
|
||
|
for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++)
|
||
|
{
|