3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Enrico Turri 2019-03-18 13:06:19 +01:00
commit 08ca5f1138
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/3DScene.hpp
View file

@ -364,7 +364,7 @@ public:
void set_volume_rotation(const Vec3d& rotation) { m_volume_transformation.set_rotation(rotation); set_bounding_boxes_as_dirty(); } void set_volume_rotation(const Vec3d& rotation) { m_volume_transformation.set_rotation(rotation); set_bounding_boxes_as_dirty(); }
void set_volume_rotation(Axis axis, double rotation) { m_volume_transformation.set_rotation(axis, rotation); set_bounding_boxes_as_dirty(); } void set_volume_rotation(Axis axis, double rotation) { m_volume_transformation.set_rotation(axis, rotation); set_bounding_boxes_as_dirty(); }
Vec3d get_volume_scaling_factor() const { return m_volume_transformation.get_scaling_factor(); } const Vec3d& get_volume_scaling_factor() const { return m_volume_transformation.get_scaling_factor(); }
double get_volume_scaling_factor(Axis axis) const { return m_volume_transformation.get_scaling_factor(axis); } double get_volume_scaling_factor(Axis axis) const { return m_volume_transformation.get_scaling_factor(axis); }
void set_volume_scaling_factor(const Vec3d& scaling_factor) { m_volume_transformation.set_scaling_factor(scaling_factor); set_bounding_boxes_as_dirty(); } void set_volume_scaling_factor(const Vec3d& scaling_factor) { m_volume_transformation.set_scaling_factor(scaling_factor); set_bounding_boxes_as_dirty(); }

6
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -371,6 +371,9 @@ void Preview::load_print()
void Preview::reload_print(bool force, bool keep_volumes) void Preview::reload_print(bool force, bool keep_volumes)
{ {
if (!IsShown() && !force)
return;
if (!keep_volumes) if (!keep_volumes)
{ {
m_canvas->reset_volumes(); m_canvas->reset_volumes();
@ -378,9 +381,6 @@ void Preview::reload_print(bool force, bool keep_volumes)
m_loaded = false; m_loaded = false;
} }
if (!IsShown() && !force)
return;
load_print(); load_print();
} }