mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bkaradzic-master'

This commit is contained in:
ocornut 2015-04-16 23:28:58 +01:00
parent 64db50ba46 508d05414a
commit 0d4f29a317
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
imgui.cpp
View File

@ -8451,7 +8451,8 @@ void ImFontAtlas::RenderCustomTexData(int pass, void* p_rects)
ImVector<stbrp_rect>& rects = *(ImVector<stbrp_rect>*)p_rects;
if (pass == 0)
{
stbrp_rect r = { 0 };
stbrp_rect r;
memset(&r, 0, sizeof(r));
r.w = (TEX_DATA_W*2)+1;
r.h = TEX_DATA_H+1;
rects.push_back(r);
@ -10488,9 +10489,9 @@ void ImGui::ShowTestWindow(bool* opened)
ImGui::End();
}
void ImGui::ShowMetricsWindow(bool* opened)
void ImGui::ShowMetricsWindow(bool* opened1)
{
if (ImGui::Begin("ImGui Metrics", opened))
if (ImGui::Begin("ImGui Metrics", opened1))
{
ImGui::Text("ImGui %s", ImGui::GetVersion());
ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);