summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-09-25 13:03:47 +0200
committerGitHub <noreply@github.com>2019-09-25 13:03:47 +0200
commit076dc9803a8969a96e432a352bc6d4d4ccae3405 (patch)
treeb0a13ae695f1d6b60fbe45791100a2100c087973 /scene
parent9b8c355eab9b0b4ab1597efac2b424fbaf24ff1f (diff)
parentc2bcc3f700643e042fff250cde360f87c46086dd (diff)
Merge pull request #32119 from Calinou/unify-axis-colors
Use the same axis colors consistently in the 2D and 3D editors
Diffstat (limited to 'scene')
-rw-r--r--scene/2d/position_2d.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp
index f0c46a5fb7..e37407ceb3 100644
--- a/scene/2d/position_2d.cpp
+++ b/scene/2d/position_2d.cpp
@@ -38,8 +38,9 @@ const float DEFAULT_GIZMO_EXTENTS = 10.0;
void Position2D::_draw_cross() {
float extents = get_gizmo_extents();
- draw_line(Point2(-extents, 0), Point2(+extents, 0), Color(1, 0.5, 0.5));
- draw_line(Point2(0, -extents), Point2(0, +extents), Color(0.5, 1, 0.5));
+ // Colors taken from `axis_x_color` and `axis_y_color` (defined in `editor/editor_themes.cpp`)
+ draw_line(Point2(-extents, 0), Point2(+extents, 0), Color(0.96, 0.20, 0.32));
+ draw_line(Point2(0, -extents), Point2(0, +extents), Color(0.53, 0.84, 0.01));
}
Rect2 Position2D::_edit_get_rect() const {