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

Fix of merge conflict and uninitialized variables in writer class

Browse source
This commit is contained in:
Lukas Matena 2018-02-22 09:28:31 +01:00
parent de92f45eaf
commit 5a02bde170
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -366,8 +366,8 @@ private:
float m_angle_deg = 0.f;
float m_y_shift = 0.f;
WipeTower::xy m_wipe_tower_pos;
float m_wipe_tower_width;
float m_wipe_tower_depth;
float m_wipe_tower_width = 0.f;
float m_wipe_tower_depth = 0.f;
float m_last_fan_speed = 0.f;
std::string

2
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -183,7 +183,7 @@ private:
xy m_wipe_tower_pos; // Left front corner of the wipe tower in mm.
float m_wipe_tower_width; // Width of the wipe tower.
float m_wipe_tower_depth = 0.f; // Depth of the wipe tower
float m_wipe_tower_rotation_angle; // Wipe tower rotation angle in degrees (with respect to x axis
float m_wipe_tower_rotation_angle = 0.f; // Wipe tower rotation angle in degrees (with respect to x axis
float m_y_shift = 0.f; // y shift passed to writer
float m_z_pos = 0.f; // Current Z position.
float m_layer_height = 0.f; // Current layer height.