diff options
author | Bartosz Taudul <wolf@nereid.pl> | 2022-10-14 20:48:38 +0300 |
---|---|---|
committer | Bartosz Taudul <wolf@nereid.pl> | 2022-10-14 20:48:38 +0300 |
commit | 27ab25709d81e0657d20700e5a621d71bfdaf2cc (patch) | |
tree | d34a1bbbe373087481a3769723e224629a4ea4f9 /server | |
parent | f25c43462a6050495d2969911364d0ae0a75bdfa (diff) |
Update imgui to f87e891f.
Diffstat (limited to 'server')
-rw-r--r-- | server/TracyView.hpp | 2 | ||||
-rw-r--r-- | server/TracyView_Options.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/TracyView.hpp b/server/TracyView.hpp index ef5baa92..ad37c0b5 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -171,7 +171,7 @@ private: Out }; - constexpr static auto DirectionToKeyMap = std::array<int, 4> { ImGuiKey_A, ImGuiKey_D, ImGuiKey_W, ImGuiKey_S }; + constexpr static auto DirectionToKeyMap = std::array<ImGuiKey, 4> { ImGuiKey_A, ImGuiKey_D, ImGuiKey_W, ImGuiKey_S }; constexpr static auto StartRangeMod = std::array<int, 4> { -1, 1, 1, -1 }; constexpr static auto EndRangeMod = std::array<int, 4> { -1, 1, -1, 1 }; diff --git a/server/TracyView_Options.cpp b/server/TracyView_Options.cpp index 450e076d..726d567e 100644 --- a/server/TracyView_Options.cpp +++ b/server/TracyView_Options.cpp @@ -116,7 +116,7 @@ void View::DrawOptions() } if( !gpuData[i]->hasCalibration ) { - ImGui::TreePush(); + ImGui::TreePush( (void*)nullptr ); auto& drift = GpuDrift( gpuData[i] ); ImGui::SetNextItemWidth( 120 * scale ); ImGui::PushID( i ); |