juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug, where std::string and wxString were mixed up.

Browse Source
This commit is contained in:
bubnikv
2019-04-29 18:10:08 +02:00
parent ebb7981d16
commit 5084d544a2
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View File

@@ -28,9 +28,9 @@ class ObjectManipulation : public OG_Settings
Vec3d size;
Vec3d size_rounded;
std::string move_label_string;
std::string rotate_label_string;
std::string scale_label_string;
wxString move_label_string;
wxString rotate_label_string;
wxString scale_label_string;
struct Instance
{
@@ -55,9 +55,9 @@ class ObjectManipulation : public OG_Settings
rotation = rotation_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
scale = scale_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
size = size_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
move_label_string = "";
rotate_label_string = "";
scale_label_string = "";
move_label_string = wxString();
rotate_label_string = wxString();
scale_label_string = wxString();
instance.reset();
}
bool is_valid() const { return position != Vec3d(DBL_MAX, DBL_MAX, DBL_MAX); }