3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Enrico Turri 2018-12-17 12:42:16 +01:00
commit 4dc1eee560
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Format/PRUS.cpp
View file

@ -329,7 +329,7 @@ bool load_prus(const char *path, Model *model)
if (! mz_zip_reader_file_stat(&archive, i, &stat)) if (! mz_zip_reader_file_stat(&archive, i, &stat))
continue; continue;
std::vector<char> buffer; std::vector<char> buffer;
buffer.assign((size_t)stat.m_uncomp_size + 1, 0); buffer.assign((size_t)stat.m_uncomp_size, 0);
res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (char*)buffer.data(), (size_t)stat.m_uncomp_size, 0); res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (char*)buffer.data(), (size_t)stat.m_uncomp_size, 0);
if (res == MZ_FALSE) if (res == MZ_FALSE)
std::runtime_error(std::string("Error while extracting a file from ") + path); std::runtime_error(std::string("Error while extracting a file from ") + path);

1
src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -487,7 +487,6 @@ WipeTowerPrusaMM::material_type WipeTowerPrusaMM::parse_material(const char *nam
return INVALID; return INVALID;
} }
// Returns gcode to prime the nozzles at the front edge of the print bed. // Returns gcode to prime the nozzles at the front edge of the print bed.
WipeTower::ToolChangeResult WipeTowerPrusaMM::prime( WipeTower::ToolChangeResult WipeTowerPrusaMM::prime(
// print_z of the first layer. // print_z of the first layer.

2
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -155,7 +155,7 @@ class GLCanvas3D
// float distance; // float distance;
#if !ENABLE_CONSTRAINED_CAMERA_TARGET #if !ENABLE_CONSTRAINED_CAMERA_TARGET
Vec3d target; Vec3d target;
#endif !// ENABLE_CONSTRAINED_CAMERA_TARGET #endif // ENABLE_CONSTRAINED_CAMERA_TARGET
private: private:
#if ENABLE_CONSTRAINED_CAMERA_TARGET #if ENABLE_CONSTRAINED_CAMERA_TARGET