Merge branch 'master' of https://github.com/prusa3d/Slic3r

src/libslic3r/PrintConfig.cpp

@@ -3118,7 +3118,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
     def->tooltip = L("Messages with severity lower or eqal to the loglevel will be printed out. 0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal");
     def->min = 0;
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && defined(SLIC3R_GUI)
     def = this->add("sw_renderer", coBool);
     def->label = L("Render with a software renderer");
     def->tooltip = L("Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver.");

src/slic3r.cpp

@@ -40,8 +40,11 @@
 #include "libslic3r/Utils.hpp"
 
 #include "slic3r.hpp"
-#include "slic3r/GUI/GUI.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
+
+#ifdef SLIC3R_GUI
+    #include "slic3r/GUI/GUI.hpp"
+    #include "slic3r/GUI/GUI_App.hpp"
+#endif /* SLIC3R_GUI */
 
 using namespace Slic3r;
 

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -771,7 +771,7 @@ void GLGizmoSlaSupports::on_render_input_window(float x, float y, float bottom_l
 RENDER_AGAIN:
     m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
 
-    const ImVec2 window_size(m_imgui->scaled(17.f, 18.f));
+    const ImVec2 window_size(m_imgui->scaled(17.f, 20.f));
     ImGui::SetNextWindowPos(ImVec2(x, y - std::max(0.f, y+window_size.y-bottom_limit) ));
     ImGui::SetNextWindowSize(ImVec2(window_size));
 

src/slic3r_app_msvc.cpp

@@ -266,6 +266,8 @@ int wmain(int argc, wchar_t **argv)
 		} else
 			printf("MESA OpenGL library was loaded sucessfully\n");		
 	}
+#endif /* SLIC3R_GUI */
+
 
 	wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 };
 	wcscpy(path_to_slic3r, path_to_exe);
@@ -276,7 +278,6 @@ int wmain(int argc, wchar_t **argv)
 		printf("slic3r.dll was not loaded\n");
 		return -1;
 	}
-#endif /* SLIC3R_GUI */
 
 	// resolve function address here
 	slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,