From e43cd6e97fccb9d8a21902f0bee4b67f2e11b039 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Fri, 5 Dec 2014 23:09:43 +0000
Subject: [PATCH] Added IMGUI_INCLUDE_IMGUI_USER_H

---
 imconfig.h | 3 +++
 imgui.cpp  | 3 ++-
 imgui.h    | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/imconfig.h b/imconfig.h
index e38c59cd5..02e70da9a 100644
--- a/imconfig.h
+++ b/imconfig.h
@@ -20,6 +20,9 @@
 //---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
 //#define IMGUI_INCLUDE_IMGUI_USER_INL
 
+//---- Include imgui_user.h at the end of imgui.h
+//#define IMGUI_INCLUDE_IMGUI_USER_H
+
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
 /*
 #define IM_VEC2_CLASS_EXTRA                                                 \
diff --git a/imgui.cpp b/imgui.cpp
index 63bc6619d..4db1a5b6f 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -7559,7 +7559,8 @@ void ImGui::GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, co
 
 //-----------------------------------------------------------------------------
 
-//---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
+//---- Include imgui_user.inl at the end of imgui.cpp
+//---- So you can include code that extends ImGui using its private data/functions.
 #ifdef IMGUI_INCLUDE_IMGUI_USER_INL
 #include "imgui_user.inl"
 #endif
diff --git a/imgui.h b/imgui.h
index 4281e55a7..6d050a3cc 100644
--- a/imgui.h
+++ b/imgui.h
@@ -777,3 +777,10 @@ struct ImFont
     };
 #pragma pack(pop)
 };
+
+//---- Include imgui_user.h at the end of imgui.h
+//---- So you can include code that extends ImGui using any of the types declared above.
+//---- (also convenient for user to only explicitly include vanilla imgui.h)
+#ifdef IMGUI_INCLUDE_IMGUI_USER_H
+#include "imgui_user.h"
+#endif