Minor bits, placeholder aimed at facilitating merging of Tables branch into Docking

# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2019-12-19 15:02:55 +01:00
parent c706ff6f3a
commit 4c108d22f0
2 changed files with 63 additions and 20 deletions

View File

@ -1321,7 +1321,7 @@ void ImDrawListSplitter::Merge(ImDrawList* draw_list)
// Merge previous channel last draw command with current channel first draw command if matching.
last_cmd->ElemCount += ch._CmdBuffer[0].ElemCount;
idx_offset += ch._CmdBuffer[0].ElemCount;
ch._CmdBuffer.erase(ch._CmdBuffer.Data);
ch._CmdBuffer.erase(ch._CmdBuffer.Data); // FIXME-OPT: Improve for multiple merges.
}
if (ch._CmdBuffer.Size > 0)
last_cmd = &ch._CmdBuffer.back();