diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 7e90e9a05..1c21e2f86 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -80,14 +80,6 @@ #define ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN (1 && ENABLE_2_3_0_BETA1) -//=================== -// 2.3.0.beta3 techs -//=================== -#define ENABLE_2_3_0_BETA3 1 - -#define ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE (1 && ENABLE_2_3_0_BETA3) - - //================= // 2.3.0.rc1 techs //================= diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index f46217816..d0cae1456 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -511,21 +511,14 @@ void GCodeViewer::refresh(const GCodeProcessor::Result& gcode_result, const std: #endif // ENABLE_GCODE_VIEWER_STATISTICS // update buffers' render paths -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE refresh_render_paths(); -#else - refresh_render_paths(false, false); -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE - log_memory_used("Refreshed G-code extrusion paths, "); } -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void GCodeViewer::refresh_render_paths() { refresh_render_paths(false, false); } -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void GCodeViewer::update_shells_color_by_extruder(const DynamicPrintConfig* config) { diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index f6dcce5cd..fc5afffcb 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -656,9 +656,7 @@ public: void load(const GCodeProcessor::Result& gcode_result, const Print& print, bool initialized); // recalculate ranges in dependence of what is visible and sets tool/print colors void refresh(const GCodeProcessor::Result& gcode_result, const std::vector& str_tool_colors); -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void refresh_render_paths(); -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void update_shells_color_by_extruder(const DynamicPrintConfig* config); void reset(); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3e829869b..0aec25404 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2328,14 +2328,12 @@ void GLCanvas3D::refresh_gcode_preview(const GCodeProcessor::Result& gcode_resul request_extra_frame(); } -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void GLCanvas3D::refresh_gcode_preview_render_paths() { m_gcode_viewer.refresh_render_paths(); set_as_dirty(); request_extra_frame(); } -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void GLCanvas3D::load_sla_preview() { diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index a968f526c..10294931f 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -666,9 +666,7 @@ public: void load_gcode_preview(const GCodeProcessor::Result& gcode_result); void refresh_gcode_preview(const GCodeProcessor::Result& gcode_result, const std::vector& str_tool_colors); -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void refresh_gcode_preview_render_paths(); -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE void set_gcode_view_preview_type(GCodeViewer::EViewType type) { return m_gcode_viewer.set_view_type(type); } GCodeViewer::EViewType get_gcode_view_preview_type() const { return m_gcode_viewer.get_view_type(); } void load_sla_preview(); diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 81b30e7de..bbec3496c 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -472,26 +472,8 @@ void Preview::on_combochecklist_options(wxCommandEvent& evt) return; m_canvas->set_gcode_options_visibility_from_flags(new_flags); - -#if ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE m_canvas->refresh_gcode_preview_render_paths(); update_moves_slider(); -#else - auto xored = [](unsigned int flags1, unsigned int flags2, unsigned int flag) { - auto is_flag_set = [](unsigned int flags, unsigned int flag) { - return (flags & (1 << flag)) != 0; - }; - return !is_flag_set(flags1, flag) != !is_flag_set(flags2, flag); - }; - - bool skip_refresh = xored(curr_flags, new_flags, static_cast(OptionType::Shells)) || - xored(curr_flags, new_flags, static_cast(OptionType::ToolMarker)); - - if (!skip_refresh) - refresh_print(); - else - m_canvas->set_as_dirty(); -#endif // ENABLE_RENDER_PATH_REFRESH_AFTER_OPTIONS_CHANGE } void Preview::update_bottom_toolbar()