Merge branch 'master' into docking

This commit is contained in:
ocornut
2022-07-08 16:06:47 +02:00
33 changed files with 467 additions and 411 deletions

View File

@@ -123,7 +123,7 @@ int main(int argc, char** argv)
// Setup Dear ImGui style
ImGui::StyleColorsDark();
//ImGui::StyleColorsClassic();
//ImGui::StyleColorsLight();
// Setup Platform/Renderer backends
// FIXME: Consider reworking this example to install our own GLUT funcs + forward calls ImGui_ImplGLUT_XXX ones, instead of using ImGui_ImplGLUT_InstallFuncs().