mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
de7a09f833
30 changed files with 666 additions and 658 deletions
|
@ -3,6 +3,7 @@
|
|||
|
||||
#include "GLCanvas3D.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
#include "GUI.hpp"
|
||||
#include "GUI_ObjectManipulation.hpp"
|
||||
#include "GUI_ObjectList.hpp"
|
||||
#include "Gizmos/GLGizmoBase.hpp"
|
||||
|
@ -1476,7 +1477,7 @@ void Selection::toggle_instance_printable_state()
|
|||
ModelInstance* instance = model_object->instances[instance_idx];
|
||||
const bool printable = !instance->printable;
|
||||
|
||||
wxString snapshot_text = model_object->instances.size() == 1 ? wxString::FromUTF8((boost::format("%1% %2%")
|
||||
wxString snapshot_text = model_object->instances.size() == 1 ? from_u8((boost::format("%1% %2%")
|
||||
% (printable ? _utf8(L("Set Printable")) : _utf8(L("Set Unprintable")))
|
||||
% model_object->name).str()) :
|
||||
(printable ? _(L("Set Printable Instance")) : _(L("Set Unprintable Instance")));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue