Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Conflicts: imgui.cpp
2026-09-21 02:53:41 +08:00 · 2015-07-07 12:42:29 -06:00
parent 25882c47a3 3869e10574
commit c3ced1bd71
2 changed files with 138 additions and 139 deletions
@@ -746,12 +746,11 @@ struct ImGuiIO
 template<typename T>
 class ImVector
 {
-protected:
+public:
    int                         Size;
    int                         Capacity;
    T*                          Data;

-public:
    typedef T                   value_type;
    typedef value_type*         iterator;
    typedef const value_type*   const_iterator;