From be611c1c0592d4aaa9c58f227a9c33301acd544b Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 19 Apr 2022 13:27:18 +0300
Subject: Implement Label3D node.

Add "generate_mipmap" font import option.
Add some missing features to the Sprite3D.
Move BiDi override code from Control to TextServer.
Add functions to access TextServer font cache textures.
Add MSDF related flags and shader to the standard material.
Change standard material cache to use HashMap instead of Vector.
---
 editor/filesystem_dock.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'editor/filesystem_dock.cpp')

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 778c5c33ff..33c6ce9622 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -73,7 +73,7 @@ bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory
 	}
 
 	subdirectory_item->set_text(0, dname);
-	subdirectory_item->set_structured_text_bidi_override(0, STRUCTURED_TEXT_FILE);
+	subdirectory_item->set_structured_text_bidi_override(0, TextServer::STRUCTURED_TEXT_FILE);
 	subdirectory_item->set_icon(0, get_theme_icon(SNAME("Folder"), SNAME("EditorIcons")));
 	subdirectory_item->set_icon_modulate(0, get_theme_color(SNAME("folder_icon_modulate"), SNAME("FileDialog")));
 	subdirectory_item->set_selectable(0, true);
@@ -143,7 +143,7 @@ bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory
 		for (const FileInfo &fi : file_list) {
 			TreeItem *file_item = tree->create_item(subdirectory_item);
 			file_item->set_text(0, fi.name);
-			file_item->set_structured_text_bidi_override(0, STRUCTURED_TEXT_FILE);
+			file_item->set_structured_text_bidi_override(0, TextServer::STRUCTURED_TEXT_FILE);
 			file_item->set_icon(0, _get_tree_item_icon(!fi.import_broken, fi.type));
 			String file_metadata = lpath.plus_file(fi.name);
 			file_item->set_metadata(0, file_metadata);
@@ -3026,7 +3026,7 @@ FileSystemDock::FileSystemDock() {
 	toolbar_hbc->add_child(button_hist_next);
 
 	current_path = memnew(LineEdit);
-	current_path->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE);
+	current_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	current_path->set_h_size_flags(SIZE_EXPAND_FILL);
 	_set_current_path_text(path);
 	toolbar_hbc->add_child(current_path);
-- 
cgit v1.2.3