summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-08 11:21:21 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-08 11:21:21 +0200
commite52ffba3c19bd82e62a47105664ff1382171e9d6 (patch)
tree6ea4a460f6047e9ee7f80c44faea2c7b305e93f6
parentad1993455a7cfe6c8d58a2ef3e3f99543163c7bc (diff)
parentea5ecc6b8e393b344cb7a51e884b1c08eaf92366 (diff)
downloadredot-engine-e52ffba3c19bd82e62a47105664ff1382171e9d6.tar.gz
Merge pull request #90307 from emmanuel-ferdman/wip
Update the location of editor theme
-rw-r--r--doc/classes/EditorSettings.xml2
-rw-r--r--scene/2d/marker_2d.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index 573171b7e1..87ca0536b8 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -830,7 +830,7 @@
<member name="interface/theme/icon_and_font_color" type="int" setter="" getter="">
The icon and font color scheme to use in the editor.
- [b]Auto[/b] determines the color scheme to use automatically based on [member interface/theme/base_color].
- - [b]Dark[/b] makes fonts and icons dark (suitable for light themes). Icon colors are automatically converted by the editor following the set of rules defined in [url=https://github.com/godotengine/godot/blob/master/editor/editor_themes.cpp]this file[/url].
+ - [b]Dark[/b] makes fonts and icons dark (suitable for light themes). Icon colors are automatically converted by the editor following the set of rules defined in [url=https://github.com/godotengine/godot/blob/master/editor/themes/editor_theme_manager.cpp]this file[/url].
- [b]Light[/b] makes fonts and icons light (suitable for dark themes).
</member>
<member name="interface/theme/icon_saturation" type="float" setter="" getter="">
diff --git a/scene/2d/marker_2d.cpp b/scene/2d/marker_2d.cpp
index 39026591b0..b1b9705bf8 100644
--- a/scene/2d/marker_2d.cpp
+++ b/scene/2d/marker_2d.cpp
@@ -48,7 +48,7 @@ void Marker2D::_draw_cross() {
// Use a darkened axis color for the negative axis.
// This makes it possible to see in which direction the Marker3D node is rotated
// (which can be important depending on how it's used).
- // Axis colors are taken from `axis_x_color` and `axis_y_color` (defined in `editor/editor_themes.cpp`).
+ // Axis colors are taken from `axis_x_color` and `axis_y_color` (defined in `editor/themes/editor_theme_manager.cpp`).
const Color color_x = Color(0.96, 0.20, 0.32);
const Color color_y = Color(0.53, 0.84, 0.01);
PackedColorArray colors = {