1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-18 09:14:27 +00:00

Merge branch 'master' into vb_wold_object_manipulation

This commit is contained in:
bubnikv
2019-05-04 20:59:57 +02:00
15 changed files with 1288 additions and 1207 deletions
+1 -1
View File
@@ -795,7 +795,7 @@ bool GLCanvas3D::WarningTexture::_generate(const std::string& msg_utf8, const GL
if (msg_utf8.empty())
return false;
wxString msg = GUI::from_u8(msg_utf8);
wxString msg = _(msg_utf8);//GUI::from_u8(msg_utf8);
wxMemoryDC memDC;