Merge branch 'merill-merge'

supermerill · Apr 25, 2021 · 2e29d79 · 2e29d79
2 parents dfc9671 + 6da4c4e
commit 2e29d79
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/resources/calibration/cube/LICENCE.txt b/resources/calibration/cube/LICENCE.txt
@@ -1,2 +1,2 @@
-voron_design_cube_v6.amf is under GPL V3, made by vorondesign (https://github.com/VoronDesign/Voron-2)
+voron_design_cube_v7.amf is under GPL V3, made by vorondesign (https://github.com/VoronDesign/Voron-2)
 xyzCalibration_cube is under CC BY-SA 3.0, made by iDig3Dprinting (https://www.thingiverse.com/thing:1278865)
diff --git a/resources/calibration/cube/voron_design_cube_v6.amf b/resources/calibration/cube/voron_design_cube_v6.amf
diff --git a/resources/calibration/cube/voron_design_cube_v7.amf b/resources/calibration/cube/voron_design_cube_v7.amf
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp
@@ -219,6 +219,7 @@ std::vector<SurfaceFill> group_fills(const Layer &layer)
                     params.anchor_length_max = float(region_config.infill_anchor_max);
                     if (region_config.infill_anchor_max.percent)
                         params.anchor_length_max = float(params.anchor_length_max * 0.01 * params.spacing);
+                    params.anchor_length = std::min(params.anchor_length, params.anchor_length_max);
                 }
 
                 auto it_params = set_surface_params.find(params);

diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
@@ -289,8 +289,8 @@ void GLIndexedVertexArray::render(
 const float GLVolume::SELECTED_COLOR[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
 const float GLVolume::HOVER_SELECT_COLOR[4] = { 0.4f, 0.9f, 0.1f, 1.0f };
 const float GLVolume::HOVER_DESELECT_COLOR[4] = { 1.0f, 0.75f, 0.75f, 1.0f };
-const float GLVolume::OUTSIDE_COLOR[4] = { 0.0f, 0.38f, 0.8f, 1.0f };
-const float GLVolume::SELECTED_OUTSIDE_COLOR[4] = { 0.19f, 0.58f, 1.0f, 1.0f };
+const float GLVolume::OUTSIDE_COLOR[4] = { 0.867f, 0.173f, 0.0f, 1.0f }; //dark red	
+const float GLVolume::SELECTED_OUTSIDE_COLOR[4] = { 1.0f, 0.239f, 0.0f, 1.0f }; //red
 const float GLVolume::DISABLED_COLOR[4] = { 0.25f, 0.25f, 0.25f, 1.0f };
 const float GLVolume::MODEL_COLOR[4][4] = {
     { 1.0f, 1.0f, 0.0f, 1.f },

diff --git a/src/slic3r/GUI/CalibrationCubeDialog.hpp b/src/slic3r/GUI/CalibrationCubeDialog.hpp
@@ -16,7 +16,7 @@ class CalibrationCubeDialog : public CalibrationAbstractDialog
 protected:
     void create_buttons(wxStdDialogButtonSizer* sizer) override;
     void create_geometry(std::string cube_path);
-    void create_geometry_voron(wxCommandEvent& event_args) { create_geometry("voron_design_cube_v6.amf"); }
+    void create_geometry_voron(wxCommandEvent& event_args) { create_geometry("voron_design_cube_v7.amf"); }
     void create_geometry_standard(wxCommandEvent& event_args) { create_geometry("xyzCalibration_cube.amf"); }
 
     wxComboBox* scale;

diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
@@ -741,11 +741,14 @@ void Preview::update_layers_slider(const std::vector<double>& layers_z, bool kee
 
     Plater* plater = wxGetApp().plater();
     CustomGCode::Info ticks_info_from_model = plater->model().custom_gcode_per_print_z;
-    //add z-shift from gcode output
-    const float z_shift = wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_float("z_offset");
-    if (can_display_gcode() && z_shift != 0) {
-        for (CustomGCode::Item& tick : ticks_info_from_model.gcodes) {
-            tick.print_z += z_shift;
+    if ( wxGetApp().preset_bundle->printers.get_edited_preset().config.option("z_offset") != nullptr )
+    {
+        //add z-shift from gcode output
+        const float z_shift = wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_float("z_offset");
+        if (can_display_gcode() && z_shift != 0) {
+            for (CustomGCode::Item& tick : ticks_info_from_model.gcodes) {
+                tick.print_z += z_shift;
+            }
         }
     }
     //check incoherencies