diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-18 20:09:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 20:09:13 +0200 |
| commit | 1327c778488665e127a332b5f047feb5a63100ef (patch) | |
| tree | 6f6c2c75529ebfc3cceaf1da715aa0ea428ae1a4 | |
| parent | 2fcf3057fd340311591eb19e7f4cc6d2f1268479 (diff) | |
| parent | c13c738c88db352c5c741d271749e1ce128a4c4b (diff) | |
Merge pull request #51845 from Paulb23/hide-textfiles
| -rw-r--r-- | doc/classes/TextFile.xml | 13 | ||||
| -rw-r--r-- | editor/plugins/visual_shader_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | scene/register_scene_types.cpp | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/doc/classes/TextFile.xml b/doc/classes/TextFile.xml deleted file mode 100644 index 1c2c2ff25c..0000000000 --- a/doc/classes/TextFile.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<class name="TextFile" inherits="Resource" version="4.0"> - <brief_description> - </brief_description> - <description> - </description> - <tutorials> - </tutorials> - <methods> - </methods> - <constants> - </constants> -</class> diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 2dd8270ee3..2ad854a52e 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -3114,7 +3114,7 @@ void VisualShaderEditor::_notification(int p_what) { { Color background_color = EDITOR_GET("text_editor/theme/highlighting/background_color"); Color text_color = EDITOR_GET("text_editor/theme/highlighting/text_color"); - Color keyword_color = EDITOR_GET("text_editor/highlighting/keyword_color"); + Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color"); Color control_flow_keyword_color = EDITOR_GET("text_editor/theme/highlighting/control_flow_keyword_color"); Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color"); Color symbol_color = EDITOR_GET("text_editor/theme/highlighting/symbol_color"); diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 40ab439a51..6f8091c03f 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -812,7 +812,6 @@ void register_scene_types() { GDREGISTER_CLASS(Font); GDREGISTER_CLASS(Curve); - GDREGISTER_CLASS(TextFile); GDREGISTER_CLASS(TextLine); GDREGISTER_CLASS(TextParagraph); |