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

@ -62,14 +62,14 @@ GFX_ImplementTextureProfile( BLProjectedShadowProfile,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled,
GFXTextureProfile::None );
GFXTextureProfile::NONE );
GFX_ImplementTextureProfile( BLProjectedShadowZProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::ZTarget |
GFXTextureProfile::Pooled,
GFXTextureProfile::None );
GFXTextureProfile::NONE );
ProjectedShadow::ProjectedShadow( SceneObject *object )

View file

@ -70,7 +70,7 @@ GFX_ImplementTextureProfile( ShadowMapProfile,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::RenderTarget |
GFXTextureProfile::Pooled,
GFXTextureProfile::None );
GFXTextureProfile::NONE );
GFX_ImplementTextureProfile( ShadowMapZProfile,
GFXTextureProfile::DiffuseMap,
@ -78,7 +78,7 @@ GFX_ImplementTextureProfile( ShadowMapZProfile,
GFXTextureProfile::NoMipmap |
GFXTextureProfile::ZTarget |
GFXTextureProfile::Pooled,
GFXTextureProfile::None );
GFXTextureProfile::NONE );
LightShadowMap::LightShadowMap( LightInfo *light )

View file

@ -37,7 +37,7 @@
GFX_ImplementTextureProfile(ShadowMapTexProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::Dynamic ,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
MODULE_BEGIN( ShadowMapManager )