From b5fe41988b378d545cc4a88695a2e082130de81c Mon Sep 17 00:00:00 2001 From: Tomasz Chabora Date: Tue, 25 Aug 2020 18:12:35 +0200 Subject: [PATCH] Accept DynamicFontData for Fonts --- editor/editor_properties.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index d5cc9ac5c16..4c8af615b42 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -36,6 +36,7 @@ #include "editor_properties_array_dict.h" #include "editor_scale.h" #include "scene/main/window.h" +#include "scene/resources/dynamic_font.h" ///////////////////// NULL ///////////////////////// @@ -3014,6 +3015,8 @@ bool EditorPropertyResource::_is_drop_valid(const Dictionary &p_drag_data) const allowed_types.append("Texture2D"); } else if (at == "ShaderMaterial") { allowed_types.append("Shader"); + } else if (at == "Font") { + allowed_types.append("DynamicFontData"); } } @@ -3111,6 +3114,13 @@ void EditorPropertyResource::drop_data_fw(const Point2 &p_point, const Variant & res = mat; break; } + + if (at == "Font" && ClassDB::is_parent_class(res->get_class(), "DynamicFontData")) { + Ref font = memnew(DynamicFont); + font->set_font_data(res); + res = font; + break; + } } }