mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 16:27:54 -06:00
Merge remote-tracking branch 'origin/master' into ys_ftn_improvements
This commit is contained in:
commit
b39e9a81f3
52 changed files with 2124 additions and 1255 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue