diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-01 11:38:37 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-01 11:38:37 +0200 |
| commit | 8dc9e557072dd93e6f70d0b5504f743df26c4b2c (patch) | |
| tree | 7f00579f1abc5ddcbc13af0763ac376063fd1658 | |
| parent | ab7886ffc41326db9c1b578ff008e90a42cad446 (diff) | |
| parent | b172cb524d494867601fbb0335e55bf558429cdc (diff) | |
Merge pull request #4502 from volzhs/import-font
Allow any directory for custom character set and gradient image file …
| -rw-r--r-- | tools/editor/io_plugins/editor_font_import_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index 715e48fccf..ec251c546e 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -254,7 +254,7 @@ public: p_list->push_back(PropertyInfo(Variant::INT,"character_set/mode",PROPERTY_HINT_ENUM,"Ascii,Latin,Unicode,Custom,Custom&Latin")); if (character_set>=CHARSET_CUSTOM) - p_list->push_back(PropertyInfo(Variant::STRING,"character_set/custom",PROPERTY_HINT_FILE)); + p_list->push_back(PropertyInfo(Variant::STRING,"character_set/custom",PROPERTY_HINT_GLOBAL_FILE)); int usage = PROPERTY_USAGE_DEFAULT; @@ -290,7 +290,7 @@ public: p_list->push_back(PropertyInfo(Variant::COLOR,"color/end",PROPERTY_HINT_NONE,"",usage)); } if (color_type==COLOR_GRADIENT_IMAGE) { - p_list->push_back(PropertyInfo(Variant::STRING,"color/image",PROPERTY_HINT_FILE,"",usage)); + p_list->push_back(PropertyInfo(Variant::STRING,"color/image",PROPERTY_HINT_GLOBAL_FILE,"",usage)); } p_list->push_back(PropertyInfo(Variant::BOOL,"color/monochrome",PROPERTY_HINT_NONE,"",usage)); } |