From 05877c14df36d300366644cf1a1106a2513f8751 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Fri, 15 Oct 2021 11:51:01 +0200
Subject: [PATCH] Fixed nested BeginDisabled()/EndDisabled() bug in Docking
 branch due to bad merge. (#4655, #4452, #4453, #4462)

---
 docs/CHANGELOG.txt | 4 ++++
 imgui.cpp          | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index cfcfd9314228..86679cdb40c2 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -119,6 +119,10 @@ Other Changes:
 - Misc: Fix MinGW DLL build issue (when IMGUI_API is defined). [@rokups]
 - CI: Add MinGW DLL build to test suite. [@rokups]
 
+Docking+Viewports Branch:
+
+- Disabled: Fixed nested BeginDisabled()/EndDisabled() bug in Docking branch due to bad merge. (#4655, #4452, #4453, #4462)
+
 
 -----------------------------------------------------------------------
  VERSION 1.85 (Released 2021-10-12)
diff --git a/imgui.cpp b/imgui.cpp
index 8104f7b64437..3088739fafa3 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -7187,7 +7187,6 @@ void ImGui::BeginDisabled(bool disabled)
 {
     ImGuiContext& g = *GImGui;
     bool was_disabled = (g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0;
-    g.DisabledAlphaBackup = g.Style.Alpha;
     if (!was_disabled && disabled)
     {
         g.DisabledAlphaBackup = g.Style.Alpha;