Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

examples/imgui_impl_dx10.cpp

@@ -65,6 +65,10 @@ static void ImGui_ImplDX10_ShutdownPlatformInterface();
 // (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop)
 void ImGui_ImplDX10_RenderDrawData(ImDrawData* draw_data)
 {
+    // Avoid rendering when minimized
+    if (draw_data->DisplaySize.x <= 0.0f || draw_data->DisplaySize.y <= 0.0f)
+        return;
+
     ID3D10Device* ctx = g_pd3dDevice;
 
     // Create and grow vertex/index buffers if needed