Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None

Rename enum GFXTextureProfile::None for avoid conficts on Linux.
This commit is contained in:
Daniel Buckmaster 2014-05-10 11:01:18 +10:00
commit a42c92391a
13 changed files with 24 additions and 24 deletions

View file

@ -42,7 +42,7 @@ GFX_ImplementTextureProfile(GFXFontTextureProfile,
GFXTextureProfile::Static |
GFXTextureProfile::KeepBitmap |
GFXTextureProfile::NoMipmap,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
template<> void *Resource<GFont>::create(const Torque::Path &path)
{