Browse Source

Add .otf font support to resource browser

Chris Friesen 11 years ago
parent
commit
b903983322

+ 1 - 1
Bin/Data/Scripts/Editor/AttributeEditor.as

@@ -877,7 +877,7 @@ ResourcePicker@ resourcePicker = null;
 void InitResourcePicker()
 {
     // Fill resource picker data
-    Array<String> fontFilters = {"*.ttf", "*.fnt", "*.xml"};
+    Array<String> fontFilters = {"*.ttf", "*.otf", "*.fnt", "*.xml"};
     Array<String> imageFilters = {"*.png", "*.jpg", "*.bmp", "*.tga"};
     Array<String> luaFileFilters = {"*.lua", "*.luc"};
     Array<String> scriptFilters = {"*.as", "*.asc"};

+ 3 - 0
Bin/Data/Scripts/Editor/EditorResourceBrowser.as

@@ -76,6 +76,7 @@ const StringHash BINARY_TYPE_SHADER("USHD");
 const StringHash BINARY_TYPE_ANIMATION("UANI");
 
 const StringHash EXTENSION_TYPE_TTF(".ttf");
+const StringHash EXTENSION_TYPE_OTF(".otf");
 const StringHash EXTENSION_TYPE_OGG(".ogg");
 const StringHash EXTENSION_TYPE_WAV(".wav");
 const StringHash EXTENSION_TYPE_DDS(".dds");
@@ -1050,6 +1051,8 @@ int GetResourceType(StringHash fileType)
     // extension fileTypes
     else if (fileType == EXTENSION_TYPE_TTF)
         return RESOURCE_TYPE_FONT;
+    else if (fileType == EXTENSION_TYPE_OTF)
+        return RESOURCE_TYPE_FONT;
     else if (fileType == EXTENSION_TYPE_OGG)
         return RESOURCE_TYPE_SOUND;
     else if(fileType == EXTENSION_TYPE_WAV)