Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar
2019-09-18 17:27:14 +02:00
6 changed files with 49 additions and 28 deletions

View File

@ -1307,6 +1307,7 @@ void ImDrawListSplitter::Merge(ImDrawList* draw_list)
}
draw_list->_IdxWritePtr = idx_write;
draw_list->UpdateClipRect(); // We call this instead of AddDrawCmd(), so that empty channels won't produce an extra draw call.
draw_list->UpdateTextureID();
_Count = 1;
}