Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164

# Conflicts: # imgui.cpp # imgui_widgets.cpp
6 years ago · d4e49a2697
parent 521405488b 2714f8fa23
commit d4e49a2697
1 changed files with 0 additions and 1 deletions
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@ -2139,7 +2139,6 @@ bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType d
        g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right);
    }

-
    // Draw frame
    const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
    RenderNavHighlight(frame_bb, id);