Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

This commit is contained in:
ocornut
2015-05-02 22:20:48 +01:00
6 changed files with 403 additions and 195 deletions

View File

@ -355,7 +355,7 @@ void ImGui_ImplGlfwGL3_NewFrame()
io.MouseWheel = g_MouseWheel;
g_MouseWheel = 0.0f;
// Hide/show hardware mouse cursor
// Hide OS mouse cursor if ImGui is drawing it
glfwSetInputMode(g_Window, GLFW_CURSOR, io.MouseDrawCursor ? GLFW_CURSOR_HIDDEN : GLFW_CURSOR_NORMAL);
// Start the frame