3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tech ENABLE_RELOAD_FROM_DISK_FOR_3MF set as default

Browse source
This commit is contained in:
enricoturri1966 2021-07-21 14:10:05 +02:00
parent 4d2bee36e5
commit 9264b79be7
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/Format/3mf.cpp
View file

@ -666,7 +666,6 @@ namespace Slic3r {
close_zip_reader(&archive); close_zip_reader(&archive);
#if ENABLE_RELOAD_FROM_DISK_FOR_3MF
if (m_version == 0) { if (m_version == 0) {
// if the 3mf was not produced by PrusaSlicer and there is more than one instance, // if the 3mf was not produced by PrusaSlicer and there is more than one instance,
// split the object in as many objects as instances // split the object in as many objects as instances
@ -711,7 +710,6 @@ namespace Slic3r {
++i; ++i;
} }
} }
#endif // ENABLE_RELOAD_FROM_DISK_FOR_3MF
for (const IdToModelObjectMap::value_type& object : m_objects) { for (const IdToModelObjectMap::value_type& object : m_objects) {
if (object.second >= int(m_model->objects.size())) { if (object.second >= int(m_model->objects.size())) {
@ -779,7 +777,6 @@ namespace Slic3r {
return false; return false;
} }
#if ENABLE_RELOAD_FROM_DISK_FOR_3MF
int object_idx = 0; int object_idx = 0;
for (ModelObject* o : model.objects) { for (ModelObject* o : model.objects) {
int volume_idx = 0; int volume_idx = 0;
@ -795,7 +792,6 @@ namespace Slic3r {
} }
++object_idx; ++object_idx;
} }
#endif // ENABLE_RELOAD_FROM_DISK_FOR_3MF
// // fixes the min z of the model if negative // // fixes the min z of the model if negative
// model.adjust_min_z(); // model.adjust_min_z();
@ -1877,7 +1873,6 @@ namespace Slic3r {
stl_get_size(&stl); stl_get_size(&stl);
triangle_mesh.repair(); triangle_mesh.repair();
#if ENABLE_RELOAD_FROM_DISK_FOR_3MF
if (m_version == 0) { if (m_version == 0) {
// if the 3mf was not produced by PrusaSlicer and there is only one instance, // if the 3mf was not produced by PrusaSlicer and there is only one instance,
// bake the transformation into the geometry to allow the reload from disk command // bake the transformation into the geometry to allow the reload from disk command
@ -1887,7 +1882,6 @@ namespace Slic3r {
object.instances.front()->set_transformation(Slic3r::Geometry::Transformation()); object.instances.front()->set_transformation(Slic3r::Geometry::Transformation());
} }
} }
#endif // ENABLE_RELOAD_FROM_DISK_FOR_3MF
ModelVolume* volume = object.add_volume(std::move(triangle_mesh)); ModelVolume* volume = object.add_volume(std::move(triangle_mesh));
// stores the volume matrix taken from the metadata, if present // stores the volume matrix taken from the metadata, if present

2
src/libslic3r/Technologies.hpp
View file

@ -41,8 +41,6 @@
//==================== //====================
#define ENABLE_2_4_0_ALPHA0 1 #define ENABLE_2_4_0_ALPHA0 1
// Enable reload from disk command for 3mf files
#define ENABLE_RELOAD_FROM_DISK_FOR_3MF (1 && ENABLE_2_4_0_ALPHA0)
// Enable showing gcode line numbers in preview horizontal slider // Enable showing gcode line numbers in preview horizontal slider
#define ENABLE_GCODE_LINES_ID_IN_H_SLIDER (1 && ENABLE_2_4_0_ALPHA0) #define ENABLE_GCODE_LINES_ID_IN_H_SLIDER (1 && ENABLE_2_4_0_ALPHA0)
// Enable validation of custom gcode against gcode processor reserved keywords // Enable validation of custom gcode against gcode processor reserved keywords