asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48308 from bruvzg/fix_fontdata_race

Browse source 
Duplicate DynamicFontData resources in the editor preview generation thread to avoid race condition.
This commit is contained in:
Rémi Verschelde 2021-04-30 12:12:20 +02:00 committed by GitHub
commit 5a20cef857
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/plugins/editor_preview_plugins.cpp
View file

@ -838,14 +838,15 @@ Ref<Texture> EditorFontPreviewPlugin::generate_from_path(const String &p_path, c
ril.ptr()->wait();
RES res = ril.ptr()->get_resource();
Ref<DynamicFont> sampled_font;
sampled_font.instance();
if (res->is_class("DynamicFont")) {
sampled_font = res->duplicate();
if (sampled_font->get_outline_color() == Color(1, 1, 1, 1)) {
sampled_font->set_outline_color(Color(0, 0, 0, 1));
Ref<DynamicFont> font = res;
sampled_font->set_font_data(font->get_font_data()->duplicate());
for (int i = 0; i < font->get_fallback_count(); i++) {
sampled_font->add_fallback(font->get_fallback(i)->duplicate());
}
} else if (res->is_class("DynamicFontData")) {
sampled_font.instance();
sampled_font->set_font_data(res);
sampled_font->set_font_data(res->duplicate());
}
sampled_font->set_size(50);