diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-12 21:06:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 21:06:03 +0100 |
| commit | e9392dd876181c58ebdc309be84cbf397784e87b (patch) | |
| tree | 3e9ecd4772387c68ffd73a79d16140887bf5767a | |
| parent | b65344115e6bfc9326e28fbb9b7306c5f7dfded0 (diff) | |
| parent | f75028a34c4a9e9659c3a81d204887866b81c97d (diff) | |
Merge pull request #12858 from dfleury2/master
fix: Updates dynamic_font_stb to use get_extension, and memnew
| -rw-r--r-- | scene/resources/dynamic_font_stb.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp index 91263fb125..4aa47cb664 100644 --- a/scene/resources/dynamic_font_stb.cpp +++ b/scene/resources/dynamic_font_stb.cpp @@ -333,8 +333,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) { //blit to image and texture { - - Image img(tex.texture_size, tex.texture_size, 0, Image::FORMAT_LA8, tex.imgdata); + Ref<Image> img = memnew(Image(tex.texture_size, tex.texture_size, 0, Image::FORMAT_LA8, tex.imgdata)); if (tex.texture.is_null()) { tex.texture.instance(); @@ -518,7 +517,7 @@ bool ResourceFormatLoaderDynamicFont::handles_type(const String &p_type) const { String ResourceFormatLoaderDynamicFont::get_resource_type(const String &p_path) const { - String el = p_path.extension().to_lower(); + String el = p_path.get_extension().to_lower(); if (el == "ttf") return "DynamicFontData"; return ""; |