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

Merge remote-tracking branch 'origin/master' into ys_ftn_improvements

Browse source
This commit is contained in:
YuSanka 2019-04-25 08:12:19 +02:00
commit b39e9a81f3
52 changed files with 2124 additions and 1255 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View file

@ -7,7 +7,7 @@
#include "GLCanvas3D.hpp"
class wxStaticText;
class PrusaLockButton;
class LockButton;
class wxStaticBitmap;
namespace Slic3r {
@ -77,7 +77,7 @@ class ObjectManipulation : public OG_Settings
Vec3d m_new_size;
bool m_new_enabled;
bool m_uniform_scale {true};
PrusaLockButton* m_lock_bnt{ nullptr };
LockButton* m_lock_bnt{ nullptr };
wxBitmap m_manifold_warning_bmp;
wxStaticBitmap* m_fix_throught_netfab_bitmap;