godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41511 from KoBeWi/dynamite_font 

Accept DynamicFontData for Fonts
This commit is contained in:
Rémi Verschelde 2020-08-25 18:41:03 +02:00 committed by GitHub
parent b2aae76f85 b5fe41988b
commit a609b30ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_properties.cpp
View File

@ -36,6 +36,7 @@
#include "editor_properties_array_dict.h" #include "editor_properties_array_dict.h"
#include "editor_scale.h" #include "editor_scale.h"
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/dynamic_font.h"
///////////////////// NULL ///////////////////////// ///////////////////// NULL /////////////////////////
@ -3014,6 +3015,8 @@ bool EditorPropertyResource::_is_drop_valid(const Dictionary &p_drag_data) const
allowed_types.append("Texture2D"); allowed_types.append("Texture2D");
} else if (at == "ShaderMaterial") { } else if (at == "ShaderMaterial") {
allowed_types.append("Shader"); 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; res = mat;
break; break;
} }
if (at == "Font" && ClassDB::is_parent_class(res->get_class(), "DynamicFontData")) {
Ref<DynamicFont> font = memnew(DynamicFont);
font->set_font_data(res);
res = font;
break;
}
} }
} }