From 9f2d44966e43bb54247963cde1309b5a7a0f6785 Mon Sep 17 00:00:00 2001
From: bank <bank@deelogic.net>
Date: Thu, 1 May 2014 12:51:08 +0400
Subject: [PATCH] Fix: Some compilers do not auto-cast String and Path classes
 to (char *).

---
 Engine/source/T3D/player.cpp             | 2 +-
 Engine/source/gfx/D3D9/gfxD3D9Shader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp
index 75c42e9b6..6edbd2e21 100644
--- a/Engine/source/T3D/player.cpp
+++ b/Engine/source/T3D/player.cpp
@@ -587,7 +587,7 @@ bool PlayerData::preload(bool server, String &errorStr)
 
             if (!fileRef)
             {
-               errorStr = String::ToString("PlayerData: Mounted image %d loading failed, shape \"%s\" is not found.",i,mShapeFP[i].getPath());
+               errorStr = String::ToString("PlayerData: Mounted image %d loading failed, shape \"%s\" is not found.",i,mShapeFP[i].getPath().getFullPath().c_str());
                return false;
             }
 
diff --git a/Engine/source/gfx/D3D9/gfxD3D9Shader.cpp b/Engine/source/gfx/D3D9/gfxD3D9Shader.cpp
index 34b9c47d2..a7ff68a78 100644
--- a/Engine/source/gfx/D3D9/gfxD3D9Shader.cpp
+++ b/Engine/source/gfx/D3D9/gfxD3D9Shader.cpp
@@ -444,7 +444,7 @@ const String GFXD3D9ShaderConstBuffer::describeSelf() const
       GenericConstBufferLayout::ParamDesc pd;
       mVertexConstBufferLayoutF->getDesc(i, pd);
 
-      ret += String::ToString("      Constant name: %s", pd.name);
+      ret += String::ToString("      Constant name: %s", pd.name.c_str());
    }
 
    return ret;