16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 00:09:19 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-10-12 17:34:40 +02:00
16 changed files with 10629 additions and 9430 deletions

View File

@@ -239,6 +239,7 @@ void ui_layer::render()
// template method implementation
render_();
glBindBuffer(GL_ARRAY_BUFFER, 0);
ImGui::Render();
Timer::subsystem.gfx_gui.stop();