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

ImDrawList: Merging issue fix.
This commit is contained in:
omar 2017-10-15 21:07:05 +02:00 committed by GitHub
commit bebc49bc2a

View File

@ -222,7 +222,7 @@ void ImDrawList::UpdateTextureID()
// Try to merge with previous command if it matches, else use current command // Try to merge with previous command if it matches, else use current command
ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL; 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(); CmdBuffer.pop_back();
else else
curr_cmd->TextureId = curr_texture_id; curr_cmd->TextureId = curr_texture_id;