From 3a776d93f2beb6d36b00d555e0b249228ad0d54e Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 21 May 2016 23:03:21 +0200 Subject: [PATCH] Fixed compile issue (bloody git stashes) (#668) --- imgui.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index 6f79ef82..ae1e3445 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -4200,7 +4200,6 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us // Setup drawing context window->DC.IndentX = 0.0f + window->WindowPadding.x - window->Scroll.x; - window->DC.GroupOffsetX = 0.0f; window->DC.ColumnsOffsetX = 0.0f; window->DC.CursorStartPos = window->Pos + ImVec2(window->DC.IndentX + window->DC.ColumnsOffsetX, window->TitleBarHeight() + window->MenuBarHeight() + window->WindowPadding.y - window->Scroll.y); window->DC.CursorPos = window->DC.CursorStartPos;