Skip to content

Commit 727229e

Browse files
committed
Editor: Don't duplicated ImVec2/ImVec3 == != operators defined since ImGui r19002 (#268)
1 parent 9399cb4 commit 727229e

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

docs/CHANGELOG.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ v0.10.0 (WIP):
1414

1515
BUGFIX: Canvas: Remember index of first command buffer to not miss updating any used (#260)
1616

17+
BUGFIX: Editor: Don't duplicated ImVec2/ImVec3 == != operators defined since ImGui r19002 (#268)
18+
1719
v0.9.2 (2023-09-01):
1820

1921
NEW: Editor: Add offset of hover/select to style (thanks @MultiPain)

imgui_extra_math.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ struct ImLine
3030

3131

3232
//------------------------------------------------------------------------------
33+
# if IMGUI_VERSION_NUM < 19002
3334
inline bool operator==(const ImVec2& lhs, const ImVec2& rhs);
3435
inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs);
36+
# endif
3537
inline ImVec2 operator*(const float lhs, const ImVec2& rhs);
3638
# if IMGUI_VERSION_NUM < 18955
3739
inline ImVec2 operator-(const ImVec2& lhs);

imgui_extra_math.inl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020

2121
//------------------------------------------------------------------------------
22+
# if IMGUI_VERSION_NUM < 19002
2223
inline bool operator==(const ImVec2& lhs, const ImVec2& rhs)
2324
{
2425
return lhs.x == rhs.x && lhs.y == rhs.y;
@@ -28,6 +29,7 @@ inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs)
2829
{
2930
return lhs.x != rhs.x || lhs.y != rhs.y;
3031
}
32+
# endif
3133

3234
inline ImVec2 operator*(const float lhs, const ImVec2& rhs)
3335
{

0 commit comments

Comments
 (0)