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

Added changes missed via merge failures.

Browse source 
Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -567,11 +567,13 @@ DefineEngineMethod(className, set##name, bool, (const char* shape, S32 index),
}
#define INIT_SHAPEASSET_ARRAY(name, index) \
{\
m##name##Name[index] = StringTable->EmptyString(); \
m##name##AssetId[index] = StringTable->EmptyString(); \
m##name##Asset[index] = NULL; \
m##name[index] = NULL;\
_set##name(StringTable->insert(ShapeAsset::smNoShapeAssetFallback), index);
_set##name(StringTable->insert(ShapeAsset::smNoShapeAssetFallback), index);\
}
#ifdef TORQUE_SHOW_LEGACY_FILE_FIELDS
@ -588,9 +590,11 @@ DefineEngineMethod(className, set##name, bool, (const char* shape, S32 index),
#endif // SHOW_LEGACY_FILE_FIELDS
#define CLONE_SHAPEASSET_ARRAY(name, index) \
{\
m##name##Name[index] = other.m##name##Name[index];\
m##name##AssetId[index] = other.m##name##AssetId[index];\
m##name##Asset[index] = other.m##name##Asset[index];\
}
#define PACKDATA_SHAPEASSET_ARRAY(name, index)\
if (stream->writeFlag(m##name##Asset[index].notNull()))\