TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-12 00:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/controls/guiMLTextCtrl.cpp
View file

@ -91,7 +91,7 @@ GFX_ImplementTextureProfile(GFXMLTextureProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
const U32 GuiMLTextCtrl::csmTextBufferGrowthSize = 1024;

4
Engine/source/gui/core/guiTypes.cpp
View file

@ -63,13 +63,13 @@ GFX_ImplementTextureProfile(GFXGuiCursorProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultGUIProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static |
GFXTextureProfile::NoPadding,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GuiCursor::GuiCursor()