Merge remote-tracking branch 'origin' into 2015-07-cleanup

ago%!(EXTRA string=10 years) · 8be4d41540
parent 1befd21b37 a526b423e8
commit 8be4d41540
1 changed files with 1 additions and 1 deletions
--- a/examples/directx11_example/imgui_impl_dx11.cpp
+++ b/examples/directx11_example/imgui_impl_dx11.cpp
@ -402,7 +402,7 @@ void    ImGui_ImplDX11_InvalidateDeviceObjects()
        return;

    if (g_pFontSampler) { g_pFontSampler->Release(); g_pFontSampler = NULL; }
-    if (g_pFontTextureView) { g_pFontTextureView->Release(); ImGui::GetIO().Fonts->TexID = 0; }
+    if (g_pFontTextureView) { g_pFontTextureView->Release(); g_pFontTextureView = NULL; ImGui::GetIO().Fonts->TexID = 0; }
    if (g_pIB) { g_pIB->Release(); g_pIB = NULL; }
    if (g_pVB) { g_pVB->Release(); g_pVB = NULL; }