From c5cdba750e5c46b21bbb189b5b1894a80dcd9281 Mon Sep 17 00:00:00 2001 From: Areloch Date: Thu, 14 Jan 2021 18:00:56 -0600 Subject: [PATCH] Fixes some minor errors on MacOS regarding compiling in clang --- Engine/source/T3D/assets/MaterialAsset.cpp | 2 +- Engine/source/gfx/gfxTextureManager.cpp | 4 ++-- Engine/source/gui/controls/guiTextEditCtrl.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/T3D/assets/MaterialAsset.cpp b/Engine/source/T3D/assets/MaterialAsset.cpp index 177b524ed..e1818323a 100644 --- a/Engine/source/T3D/assets/MaterialAsset.cpp +++ b/Engine/source/T3D/assets/MaterialAsset.cpp @@ -41,7 +41,7 @@ #include "assets/assetPtr.h" #endif -#include "T3D\assets\assetImporter.h" +#include "T3D/assets/assetImporter.h" //----------------------------------------------------------------------------- diff --git a/Engine/source/gfx/gfxTextureManager.cpp b/Engine/source/gfx/gfxTextureManager.cpp index 8b5a2c9e4..db1a4135e 100644 --- a/Engine/source/gfx/gfxTextureManager.cpp +++ b/Engine/source/gfx/gfxTextureManager.cpp @@ -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; } diff --git a/Engine/source/gui/controls/guiTextEditCtrl.cpp b/Engine/source/gui/controls/guiTextEditCtrl.cpp index 09e63a301..65fd32017 100644 --- a/Engine/source/gui/controls/guiTextEditCtrl.cpp +++ b/Engine/source/gui/controls/guiTextEditCtrl.cpp @@ -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