3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix DEBUG build (#3861)

Browse source 
* Fix asserts which would not compile.

* Fix DEBUG build.

Fully enable checking gcode placeholders in debug builds.
This commit is contained in:
Seth LaForge 2024-01-28 23:14:54 -08:00 • committed by GitHub
parent 3b7b10f72f
commit ab161d5a2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View file

@ -2956,7 +2956,7 @@ std::string GCode::placeholder_parser_process(const std::string &name, const std
// Orca: Added CMake config option since debug is rarely used in current workflow. // Orca: Added CMake config option since debug is rarely used in current workflow.
// Also changed from throwing error immediately to storing messages till slicing is completed // Also changed from throwing error immediately to storing messages till slicing is completed
// to raise all errors at the same time. // to raise all errors at the same time.
#if !defined(NDEBUG) || ORCA_CHECK_GCODE_PLACEHOLDERS // CHECK_CUSTOM_GCODE_PLACEHOLDERS #if ORCA_CHECK_GCODE_PLACEHOLDERS
if (config_override) { if (config_override) {
const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders(); const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders();

5
src/libslic3r/GCode.hpp
View file

@ -523,6 +523,11 @@ private:
double m_last_mm3_per_mm; double m_last_mm3_per_mm;
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
// Always check gcode placeholders when building in debug mode.
#if !defined(NDEBUG)
#define ORCA_CHECK_GCODE_PLACEHOLDERS 1
#endif
#if ORCA_CHECK_GCODE_PLACEHOLDERS #if ORCA_CHECK_GCODE_PLACEHOLDERS
std::map<std::string, std::vector<std::string>> m_placeholder_error_messages; std::map<std::string, std::vector<std::string>> m_placeholder_error_messages;
#endif #endif