nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-05-12 22:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12858 from dfleury2/master

Browse Source 
fix: Updates dynamic_font_stb to use get_extension, and memnew
This commit is contained in:
Rémi Verschelde
2017-11-12 21:06:03 +01:00
committed by GitHub
parent b65344115e f75028a34c
commit e9392dd876
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/resources/dynamic_font_stb.cpp
+2 -3
View File
@@ -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 "";