1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-20 01:34:20 +00:00

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

Conflicts:
	imgui.cpp
	imgui.h
This commit is contained in:
ocornut 2015-05-15 17:33:04 +01:00
commit e9b6e437eb
6 changed files with 346 additions and 226 deletions

View file

@ -239,6 +239,10 @@ static void ImGui_ImplDX9_CreateFontsTexture()
// Store our identifier
io.Fonts->TexID = (void *)pTexture;
// Cleanup (don't clear the input data if you want to append new fonts later)
io.Fonts->ClearInputData();
io.Fonts->ClearTexData();
}
bool ImGui_ImplDX9_CreateDeviceObjects()