Merged in rokups/tracy/fix-imgui-build (pull request #13)

Define ImVec2 math operators only when IMGUI_DEFINE_MATH_OPERATORS is undefined.
This commit is contained in:
Rokas Kupstys 2018-07-17 13:41:15 +00:00 committed by Bartosz Taudul
commit c2f52d9ef7

View File

@ -4,7 +4,9 @@
#include "../imgui/imgui.h" #include "../imgui/imgui.h"
#include "../imgui/imgui_internal.h" #include "../imgui/imgui_internal.h"
#if !IMGUI_DEFINE_MATH_OPERATORS
static inline ImVec2 operator+( const ImVec2& l, const ImVec2& r ) { return ImVec2( l.x + r.x, l.y + r.y ); } static inline ImVec2 operator+( const ImVec2& l, const ImVec2& r ) { return ImVec2( l.x + r.x, l.y + r.y ); }
static inline ImVec2 operator-( const ImVec2& l, const ImVec2& r ) { return ImVec2( l.x - r.x, l.y - r.y ); } static inline ImVec2 operator-( const ImVec2& l, const ImVec2& r ) { return ImVec2( l.x - r.x, l.y - r.y ); }
#endif
#endif #endif