From bb4d19ff7cbd1daf293b07036dff1a049d7e7bee Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 23 Dec 2016 12:15:09 +0100 Subject: [PATCH] Merge branch 'master' - merge fix --- imgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index f2242252c..cb5da0cf9 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2634,7 +2634,7 @@ static void NavUpdate() const float move_speed = ImFloor(600 * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y)); g.NavWindowingTarget->PosFloat += move_delta * move_speed; g.NavDisableMouseHover = true; - MarkSettingsDirty(g.NavWindowingTarget); + MarkIniSettingsDirty(g.NavWindowingTarget); } }