Merge branch 'master' into navigation

# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2017-08-26 18:43:10 +08:00
12 changed files with 143 additions and 90 deletions

View File

@ -390,7 +390,7 @@ void ImGui_ImplGlfwGL3_NewFrame()
}
else
{
io.MousePos = ImVec2(-1,-1);
io.MousePos = ImVec2(-FLT_MAX,-FLT_MAX);
}
for (int i = 0; i < 3; i++)