diff --git a/Engine/source/T3D/assets/MaterialAsset.h b/Engine/source/T3D/assets/MaterialAsset.h index 7e45a539f..3c1c70720 100644 --- a/Engine/source/T3D/assets/MaterialAsset.h +++ b/Engine/source/T3D/assets/MaterialAsset.h @@ -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\ diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index 85d21f064..30b0547f5 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/Engine/source/T3D/assets/ShapeAsset.h @@ -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())\ {\ diff --git a/Tools/CMake/Info.plist.in b/Tools/CMake/Info.plist.in index 75e1cb85b..8c39d8f4f 100644 --- a/Tools/CMake/Info.plist.in +++ b/Tools/CMake/Info.plist.in @@ -16,5 +16,7 @@ APPL CFBundleVersion 1.0 + SDL_FILESYSTEM_BASE_DIR_TYPE + parent