From a8456786b6e4ef59cbeaf3b54f3dbf959f1cd5d2 Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Wed, 20 Oct 2021 21:55:11 -0700 Subject: [PATCH] merge master --- backends/implot_backend.h | 2 +- backends/implot_impl_opengl3.h | 2 +- implot_items.cpp | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/backends/implot_backend.h b/backends/implot_backend.h index 8aff43c..2343de7 100644 --- a/backends/implot_backend.h +++ b/backends/implot_backend.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.10 WIP +// ImPlot v0.13 WIP #pragma once diff --git a/backends/implot_impl_opengl3.h b/backends/implot_impl_opengl3.h index 0655fcc..0b4681a 100644 --- a/backends/implot_impl_opengl3.h +++ b/backends/implot_impl_opengl3.h @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// ImPlot v0.10 WIP +// ImPlot v0.13 WIP #pragma once diff --git a/implot_items.cpp b/implot_items.cpp index b2993ed..dc2195e 100644 --- a/implot_items.cpp +++ b/implot_items.cpp @@ -89,16 +89,6 @@ template <> const ImGuiDataType ImGuiDataTypeGetter::Value = ImGuiDataTy template <> const ImGuiDataType ImGuiDataTypeGetter::Value = ImGuiDataType_U64; template <> const ImGuiDataType ImGuiDataTypeGetter::Value = ImGuiDataType_S64; -//----------------------------------------------------------------------------- -// Utils -//----------------------------------------------------------------------------- - -// Calc maximum index size of ImDrawIdx -template -struct MaxIdx { static const unsigned int Value; }; -template <> const unsigned int MaxIdx::Value = 65535; -template <> const unsigned int MaxIdx::Value = 4294967295; - //----------------------------------------------------------------------------- // Item Utils //-----------------------------------------------------------------------------