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

Merge pull request #353 from Azaezel/alpha40_GCC_fixups

Browse source 
fix GCC compile
This commit is contained in:
Brian Roberts 2020-10-08 18:18:49 -05:00 • committed by GitHub
commit 97fd3fba5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/assets/ImageAsset.h
View file

@ -145,13 +145,13 @@ DefineEnumType(ImageAssetType);
StringTableEntry m##name##AssetId;\
AssetPtr<ImageAsset> m##name##Asset;\
public: \
const String& get##name##() const { return m##name##Filename; }\
void set##name##(FileName _in) { m##name##Filename = _in; }\
const String& get##name() const { return m##name##Filename; }\
void set##name(FileName _in) { m##name##Filename = _in; }\
const AssetPtr<ImageAsset> & get##name##Asset() const { return m##name##Asset; }\
void set##name##Asset(AssetPtr<ImageAsset>_in) { m##name##Asset = _in; }
#define GET_TEXTUREMAP(name) get##name##()
#define SET_TEXTUREMAP(name,_in) set##name##(_in)
#define GET_TEXTUREMAP(name) get##name()
#define SET_TEXTUREMAP(name,_in) set##name(_in)
#define GET_TEXTUREASSET(name) get##name##Asset()
#define SET_TEXTUREASSET(name,_in) set##name##Asset(_in)

2
Engine/source/T3D/rigidShape.h
View file

@ -38,7 +38,7 @@
class ParticleEmitter;
class ParticleEmitterData;
class ClippedPolyList;
class RigidShape;
class RigidShapeData : public ShapeBaseData
{
typedef ShapeBaseData Parent;