From 05885b2e6df95d7c044f60581ddcef4b7c59c831 Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Mon, 15 Jan 2018 20:18:01 +0100
Subject: [PATCH] Merge fix.

---
 imgui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imgui.cpp b/imgui.cpp
index 300dc7a3..406f3a30 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3869,7 +3869,7 @@ void ImGui::Render()
                 AddWindowToDrawDataSelectLayer(window);
         }
         if (g.NavWindowingTarget && g.NavWindowingTarget->Active && g.NavWindowingTarget->HiddenFrames <= 0) // NavWindowingTarget is always temporarily displayed as the front-most window
-            AddWindowToDrawDataSelectLayer(&g.DrawDataBuilder, g.NavWindowingTarget);
+            AddWindowToDrawDataSelectLayer(g.NavWindowingTarget);
         g.DrawDataBuilder.FlattenIntoSingleLayer();
 
         // Draw software mouse cursor if requested