summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorTomasz Chabora <kobewi4e@gmail.com>2020-08-25 18:12:35 +0200
committerTomasz Chabora <kobewi4e@gmail.com>2020-08-25 18:12:35 +0200
commitb5fe41988b378d545cc4a88695a2e082130de81c (patch)
tree410fb0b8ade013e177921db5321194d23f06336b /editor
parentb2aae76f8553e81e9d66853918f9557f6abbecb2 (diff)
Accept DynamicFontData for Fonts
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_properties.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index d5cc9ac5c1..4c8af615b4 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<DynamicFont> font = memnew(DynamicFont);
+ font->set_font_data(res);
+ res = font;
+ break;
+ }
}
}