TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #430 from Azaezel/alpha40/macfixes

Browse source 
mac fixes
This commit is contained in:
Brian Roberts 2020-12-31 14:50:59 -06:00 committed by GitHub
parent a0581dce2a 6b53b6581a
commit 07b9887cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -198,7 +198,7 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
if (stream->writeFlag(m##name##Asset.notNull()))\
{\
NetStringHandle assetIdStr = m##name##Asset.getAssetId();\
##netconn##->packNetStringHandleU(stream, assetIdStr);\
netconn->packNetStringHandleU(stream, assetIdStr);\
}\
else\
stream->writeString(m##name##Name);
@ -206,7 +206,7 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
#define unpackMaterialAsset(netconn, name)\
if (stream->readFlag())\
{\
m##name##AssetId = StringTable->insert(##netconn##->unpackNetStringHandleU(stream).getString());\
m##name##AssetId = StringTable->insert(netconn->unpackNetStringHandleU(stream).getString());\
MaterialAsset::getAssetById(m##name##AssetId, &m##name##Asset);\
}\
else\

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

@ -269,14 +269,14 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
}\
return false;\
}\
void className::pack##name##Asset(BitStream *stream)\
void pack##name##Asset(BitStream *stream)\
{\
if (stream->writeFlag(m##name##Asset.notNull()))\
stream->writeString(m##name##Asset.getAssetId());\
else\
stream->writeString(m##name##Name);\
}\
void className::unpack##name##Asset(BitStream *stream)\
void unpack##name##Asset(BitStream *stream)\
{\
if (stream->readFlag())\
{\

2
Tools/CMake/Info.plist.in
View file

@ -16,5 +16,7 @@
<string>APPL</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>SDL_FILESYSTEM_BASE_DIR_TYPE</key>
<string>parent</string>
</dict>
</plist>