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

Merge pull request #451 from Areloch/macOSMinorFixes

Browse source 
Fixes some minor errors on MacOS regarding compiling in clang
This commit is contained in:
Brian Roberts 2021-01-14 22:16:44 -06:00 committed by GitHub
parent 64c9667bad c5cdba750e
commit b8b62292bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -41,7 +41,7 @@
#include "assets/assetPtr.h"
#endif
#include "T3D\assets\assetImporter.h"
#include "T3D/assets/assetImporter.h"
//-----------------------------------------------------------------------------

4
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -900,14 +900,14 @@ GBitmap *GFXTextureManager::loadUncompressedTexture(const Torque::Path &path, GF
if (inBitmap == NULL)
{
Con::warnf("GFXTextureManager::loadUncompressedTexture unable to load texture: %s", path.getFullPath());
Con::warnf("GFXTextureManager::loadUncompressedTexture unable to load texture: %s", path.getFullPath().c_str());
return NULL;
}
// Set the format so we don't have to handle which channels are where.
if (!inBitmap->setFormat(GFXFormatR8G8B8A8))
{
Con::warnf("GFXTextureManager::loadUncompressedTexture unable to handle texture format: %s", path.getFullPath());
Con::warnf("GFXTextureManager::loadUncompressedTexture unable to handle texture format: %s", path.getFullPath().c_str());
return NULL;
}

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

@ -144,7 +144,7 @@ GuiTextEditCtrl::GuiTextEditCtrl()
mPlaceholderText = StringTable->EmptyString();
#if defined(__MACOSX__)
UTF8 bullet[4] = { 0xE2, 0x80, 0xA2, 0 };
UTF8 bullet[4] = { UTF8(0xE2), UTF8(0x80), UTF8(0xA2), 0 };
mPasswordMask = StringTable->insert( bullet );
#else