Merge branch 'master' into 2016-02-colorpicker

ago%!(EXTRA string=9 years) · cff815fd2d
parent bfe1e163b8 0f9addb002
commit cff815fd2d
1 changed files with 1 additions and 0 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -4257,6 +4257,7 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us
        window->DC.ItemWidthStack.resize(0);
        window->DC.AllowKeyboardFocusStack.resize(0);
        window->DC.ButtonRepeatStack.resize(0);
+        window->DC.TextWrapPosStack.resize(0);
        window->DC.ColumnsCurrent = 0;
        window->DC.ColumnsCount = 1;
        window->DC.ColumnsStartPosY = window->DC.CursorPos.y;