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

Merge pull request #14821 from ibrahn/fnt-load-root-fix

Browse source 
BitmapFont::create_from_fnt loading file from project root.
This commit is contained in:
Rémi Verschelde 2017-12-19 12:53:41 +01:00 committed by GitHub
commit 49eea481ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/resources/font.cpp
View file

@ -257,8 +257,8 @@ Error BitmapFont::create_from_fnt(const String &p_file) {
if (keys.has("file")) {
String file = keys["file"];
file = p_file.get_base_dir() + "/" + file;
String base_dir = p_file.get_base_dir();
String file = base_dir.plus_file(keys["file"]);
Ref<Texture> tex = ResourceLoader::load(file);
if (tex.is_null()) {
ERR_PRINT("Can't load font texture!");