Merge branch 'master' into viewport

# Conflicts:
#	examples/README.txt
#	imgui.cpp
This commit is contained in:
omar
2019-01-21 16:52:22 +01:00
14 changed files with 259 additions and 199 deletions

View File

@ -6089,7 +6089,7 @@ static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label)
{
if (tab_bar->Flags & ImGuiTabBarFlags_DockNode)
{
ImGuiID id = ImHash(label, 0);
ImGuiID id = ImHashStr(label, 0);
KeepAliveID(id);
return id;
}