Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Conflicts: imgui.cpp
ago%!(EXTRA string=10 years) · dbc9b2ec9b
parent e0cd947904 a48130b682
commit dbc9b2ec9b
1 changed files with 0 additions and 1 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -8002,7 +8002,6 @@ void ImDrawList::Rect(const ImVec2& a, const ImVec2& b, float rounding, int roun
    r = ImMin(r, fabsf(b.x-a.x) * ( ((rounding_corners&(1|2))==(1|2)) || ((rounding_corners&(4|8))==(4|8)) ? 0.5f : 1.0f ) - 1.0f);
    r = ImMin(r, fabsf(b.y-a.y) * ( ((rounding_corners&(1|8))==(1|8)) || ((rounding_corners&(2|4))==(2|4)) ? 0.5f : 1.0f ) - 1.0f);

-    const ImVec2 uv = GImGui->FontTexUvWhitePixel;
    if (r == 0.0f || rounding_corners == 0)
    {
        LineTo(ImVec2(a.x,a.y));