From 0063734e78adc3253479ea80d4a159923b0e6706 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 28 Jul 2022 08:33:46 +0200 Subject: [PATCH] Tech ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE set as default --- src/libslic3r/PresetBundle.cpp | 4 ---- src/libslic3r/PresetBundle.hpp | 2 -- src/libslic3r/Technologies.hpp | 2 -- src/slic3r/GUI/ConfigWizard.cpp | 2 -- 4 files changed, 10 deletions(-) diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index e744d72ca..d98998cc4 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -453,10 +453,8 @@ void PresetBundle::save_changes_for_preset(const std::string& new_name, Preset:: presets.get_edited_preset().config.apply_only(presets.get_selected_preset().config, unselected_options); } -#if ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE if (type == Preset::TYPE_PRINTER) copy_bed_model_and_texture_if_needed(presets.get_edited_preset().config); -#endif // ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE // Save the preset into Slic3r::data_dir / presets / section_name / preset_name.ini presets.save_current_preset(new_name); @@ -1865,7 +1863,6 @@ void PresetBundle::set_default_suppressed(bool default_suppressed) printers.set_default_suppressed(default_suppressed); } -#if ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE void copy_bed_model_and_texture_if_needed(DynamicPrintConfig& config) { const boost::filesystem::path user_dir = boost::filesystem::absolute(boost::filesystem::path(data_dir()) / "printer").make_preferred(); @@ -1891,6 +1888,5 @@ void copy_bed_model_and_texture_if_needed(DynamicPrintConfig& config) do_copy(config.option("bed_custom_texture"), "texture"); do_copy(config.option("bed_custom_model"), "model"); } -#endif // ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE } // namespace Slic3r diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp index b36f6ed6e..021306967 100644 --- a/src/libslic3r/PresetBundle.hpp +++ b/src/libslic3r/PresetBundle.hpp @@ -178,11 +178,9 @@ private: ENABLE_ENUM_BITMASK_OPERATORS(PresetBundle::LoadConfigBundleAttribute) -#if ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE // Copies bed texture and model files to 'data_dir()\printer' folder, if needed // and updates the config accordingly extern void copy_bed_model_and_texture_if_needed(DynamicPrintConfig& config); -#endif // ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE } // namespace Slic3r diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index eda70aae2..744976df1 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -75,8 +75,6 @@ #define ENABLE_PROCESS_G2_G3_LINES (1 && ENABLE_2_5_0_ALPHA1) // Enable fix of used filament data exported to gcode file #define ENABLE_USED_FILAMENT_POST_PROCESS (1 && ENABLE_2_5_0_ALPHA1) -// Enable copy of custom bed model and texture -#define ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE (1 && ENABLE_2_5_0_ALPHA1) // Enable picking using raytracing #define ENABLE_RAYCAST_PICKING (1 && ENABLE_LEGACY_OPENGL_REMOVAL) #define ENABLE_RAYCAST_PICKING_DEBUG (0 && ENABLE_RAYCAST_PICKING) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 813804f0d..803a6bfed 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -2780,9 +2780,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese page_diams->apply_custom_config(*custom_config); page_temps->apply_custom_config(*custom_config); -#if ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE copy_bed_model_and_texture_if_needed(*custom_config); -#endif // ENABLE_COPY_CUSTOM_BED_MODEL_AND_TEXTURE const std::string profile_name = page_custom->profile_name(); preset_bundle->load_config_from_wizard(profile_name, *custom_config);