diff --git a/src/editor/gizmo.cpp b/src/editor/gizmo.cpp index 859e91b74..216dc16af 100644 --- a/src/editor/gizmo.cpp +++ b/src/editor/gizmo.cpp @@ -151,7 +151,6 @@ struct GizmoImpl final : public Gizmo void update(const Viewport& vp) override { RenderInterface* ri = m_editor.getRenderInterface(); - ri->addText2D(50, 50, 0xffFFffFF, "test"); for (int i = 0; i < m_count; ++i) { const RigidTransform gizmo_tr = getTransform(m_entities[i]); const Vec2 p = m_editor.getViewport().worldToScreenPixels(gizmo_tr.pos); diff --git a/src/engine/win/os.cpp b/src/engine/win/os.cpp index 38bd39df0..7e2f805f5 100644 --- a/src/engine/win/os.cpp +++ b/src/engine/win/os.cpp @@ -729,7 +729,19 @@ void getCurrentDirectory(char* buffer, int buffer_size) bool getSaveFilename(char* out, int max_size, const char* filter, const char* default_extension) { WCharStr wtmp(""); - WCharStr wfilter(filter ? filter : ""); + WCHAR wfilter[MAX_PATH_LENGTH]; + + const char* c = filter; + WCHAR* cout = wfilter; + while ((*c || *(c + 1)) && (c - filter) < MAX_PATH_LENGTH - 2) { + *cout = *c; + ++cout; + ++c; + } + *cout = 0; + ++cout; + *cout = 0; + WCharStr wdefault_extension(default_extension ? default_extension : ""); OPENFILENAME ofn; ZeroMemory(&ofn, sizeof(ofn)); @@ -738,7 +750,7 @@ bool getSaveFilename(char* out, int max_size, const char* filter, const char* de ofn.lpstrFile = wtmp.data; ofn.lpstrFile[0] = '\0'; ofn.nMaxFile = lengthOf(wtmp.data); - ofn.lpstrFilter = wfilter.data; + ofn.lpstrFilter = wfilter; ofn.nFilterIndex = 1; ofn.lpstrDefExt = default_extension ? wdefault_extension.data : nullptr; ofn.lpstrFileTitle = NULL;