Merge remote-tracking branch 'origin' into 2016-02-colorpicker

ago%!(EXTRA string=9 years) · bfe1e163b8
parent 996eb080fa 4bc3f9d1f7
commit bfe1e163b8
1 changed files with 0 additions and 1 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -4255,7 +4255,6 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us
        window->DC.AllowKeyboardFocus = true;
        window->DC.ButtonRepeat = false;
        window->DC.ItemWidthStack.resize(0);
-        window->DC.TextWrapPosStack.resize(0);
        window->DC.AllowKeyboardFocusStack.resize(0);
        window->DC.ButtonRepeatStack.resize(0);
        window->DC.ColumnsCurrent = 0;