3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2022-02-25 12:02:44 +01:00
commit 7d971b15a3
5 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/Selection.hpp
View file

@ -243,7 +243,6 @@ private:
#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
float m_scale_factor;
bool m_dragging;
public:
Selection();
@ -351,9 +350,7 @@ public:
const BoundingBoxf3& get_unscaled_instance_bounding_box() const;
const BoundingBoxf3& get_scaled_instance_bounding_box() const;
void start_dragging();
void stop_dragging() { m_dragging = false; }
bool is_dragging() const { return m_dragging; }
void setup_cache();
#if ENABLE_WORLD_COORDINATE
void translate(const Vec3d& displacement, ECoordinatesType type = ECoordinatesType::World);