From 567b3670613f0b695df8f783d973c53a4b6aae84 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 4 Jan 2019 16:48:41 +0100 Subject: [PATCH] Disabled the print bed mesh temporarily, bumped up the build version to alpha2, fixed one minor issue in G-code generator --- src/libslic3r/GCode.cpp | 2 +- src/libslic3r/Technologies.hpp | 2 +- version.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index b13c38742..1134b383f 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -791,7 +791,7 @@ void GCode::_do_export(Print &print, FILE *file) } } else { for (const std::string &start_gcode : print.config().start_filament_gcode.values) - _writeln(file, this->placeholder_parser_process("start_gcode", start_gcode, (unsigned int)(&start_gcode - &print.config().start_filament_gcode.values.front()))); + _writeln(file, this->placeholder_parser_process("start_filament_gcode", start_gcode, (unsigned int)(&start_gcode - &print.config().start_filament_gcode.values.front()))); } this->_print_first_layer_extruder_temperatures(file, print, start_gcode, initial_extruder_id, true); print.throw_if_canceled(); diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index dc6a2041c..bab7f3b73 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -45,7 +45,7 @@ // Improves navigation between sidebar fields #define ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION (1 && ENABLE_1_42_0_ALPHA2) // Adds print bed models to 3D scene -#define ENABLE_PRINT_BED_MODELS (1 && ENABLE_1_42_0_ALPHA2) +#define ENABLE_PRINT_BED_MODELS (0 && ENABLE_1_42_0_ALPHA2) #endif // _technologies_h_ diff --git a/version.inc b/version.inc index d648bc48b..3cdadcbb6 100644 --- a/version.inc +++ b/version.inc @@ -2,7 +2,7 @@ # (the version numbers are generated by the build script from the git current label) set(SLIC3R_FORK_NAME "Slic3r Prusa Edition") -set(SLIC3R_VERSION "1.42.0-alpha1") +set(SLIC3R_VERSION "1.42.0-alpha2") set(SLIC3R_BUILD "${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_BUILD_ID "${SLIC3R_BUILD_ID}") set(SLIC3R_RC_VERSION "1,42,0,0")