Merge pull request #1368 from ripieces/rendering-issue-1172

ImDrawList: Merging issue fix.
ago%!(EXTRA string=8 years) · bebc49bc2a
parent ce7b04e8b9 7a8eb5bdc9
commit bebc49bc2a
1 changed files with 1 additions and 1 deletions
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@ -222,7 +222,7 @@ void ImDrawList::UpdateTextureID()

    // Try to merge with previous command if it matches, else use current command
    ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL;
-    if (prev_cmd && prev_cmd->TextureId == curr_texture_id && memcmp(&prev_cmd->ClipRect, &GetCurrentClipRect(), sizeof(ImVec4)) == 0 && prev_cmd->UserCallback == NULL)
+    if (curr_cmd->ElemCount == 0 && prev_cmd && prev_cmd->TextureId == curr_texture_id && memcmp(&prev_cmd->ClipRect, &GetCurrentClipRect(), sizeof(ImVec4)) == 0 && prev_cmd->UserCallback == NULL)
        CmdBuffer.pop_back();
    else
        curr_cmd->TextureId = curr_texture_id;