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

Merge remote-tracking branch 'remotes/origin/dev_native' into vb_3dscene_partial_update

Browse source
This commit is contained in:
bubnikv 2018-11-16 18:31:39 +01:00
commit dafa4621aa
23 changed files with 804 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -337,6 +337,9 @@ class GLCanvas3D
bool dragging;
Vec2d position;
#if ENABLE_GIZMOS_ON_TOP
Vec3d scene_position;
#endif // ENABLE_GIZMOS_ON_TOP
Drag drag;
#if ENABLE_GIZMOS_RESET
bool ignore_up_event;
@ -559,6 +562,9 @@ public:
void _render_bounding_box(const BoundingBoxf3& box, float* color) const;
void _synchronize_unselected_instances();
void _synchronize_unselected_volumes();
#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
void _ensure_on_bed();
#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
};
private: