diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index 5eae41e35dd5..48d8f2dce8fb 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -492,12 +492,12 @@ void ImDrawList::AddCallback(ImDrawCallback callback, void* callback_data)
 #define ImDrawCmd_HeaderCopy(CMD_DST, CMD_SRC)          (memcpy(CMD_DST, CMD_SRC, ImDrawCmd_HeaderSize))    // Copy ClipRect, TextureId, VtxOffset
 #define ImDrawCmd_AreSequentialIdxOffset(CMD_0, CMD_1)  (CMD_0->IdxOffset + CMD_0->ElemCount == CMD_1->IdxOffset)
 
-#define ImRect_AddPoint(bb, pos)          \
-    do {                                  \
-        if (bb.x > pos.x) bb.x = pos.x;   \
-        if (bb.y > pos.y) bb.y = pos.y;   \
-        if (bb.z < pos.x) bb.z = pos.x;   \
-        if (bb.w < pos.y) bb.w = pos.y;   \
+#define ImRect_AddPoint(bb, pos)                \
+    do {                                        \
+        if ((bb).x > (pos).x) (bb).x = (pos).x; \
+        if ((bb).y > (pos).y) (bb).y = (pos).y; \
+        if ((bb).z < (pos).x) (bb).z = (pos).x; \
+        if ((bb).w < (pos).y) (bb).w = (pos).y; \
     } while (false)
 
 // Try to merge two last draw commands
@@ -756,16 +756,17 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32
 
     if ((flags & ImDrawFlags_NoAddToBoundingRect) == 0)
     {
-        float v;
-        float half_thickness = thickness * 0.5f;
+        ImVec4 local_bb(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
         ImVec4& bb = CmdBuffer.Data[CmdBuffer.Size - 1].VtxBoundingRect;
+        const float half_thickness = thickness * 0.5f;
         for (const ImVec2* p = points, *end = &points[points_count]; p < end; p++)
-        {
-            v = p->x - half_thickness; if (bb.x > v) bb.x = v;
-            v = p->x + half_thickness; if (bb.z < v) bb.z = v;
-            v = p->y - half_thickness; if (bb.y > v) bb.y = v;
-            v = p->y + half_thickness; if (bb.w < v) bb.w = v;
-        }
+            ImRect_AddPoint(local_bb, *p);
+        local_bb.x -= half_thickness;
+        local_bb.z += half_thickness;
+        local_bb.y -= half_thickness;
+        local_bb.w += half_thickness;
+        ImRect_AddPoint(bb, ImVec2(local_bb.x, local_bb.y));
+        ImRect_AddPoint(bb, ImVec2(local_bb.z, local_bb.w));
     }
 
     if (Flags & ImDrawListFlags_AntiAliasedLines)
@@ -1025,9 +1026,12 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun
 
     if ((flags & ImDrawFlags_NoAddToBoundingRect) == 0)
     {
+        ImVec4 local_bb(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX);
         ImVec4& bb = CmdBuffer.Data[CmdBuffer.Size - 1].VtxBoundingRect;
         for (const ImVec2* p = points, *end = &points[points_count]; p < end; p++)
-            ImRect_AddPoint(bb, (*p));
+            ImRect_AddPoint(local_bb, (*p));
+        ImRect_AddPoint(bb, ImVec2(local_bb.x, local_bb.y));
+        ImRect_AddPoint(bb, ImVec2(local_bb.z, local_bb.w));
     }
 
     if (Flags & ImDrawListFlags_AntiAliasedFill)