From c8e20266de6ef817ab60d9393d94ed6b6713d28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Fri, 2 Oct 2020 10:23:35 +0300 Subject: Remove string conversion due to runtime api change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-4177 Change-Id: Ie14ff94f6ebc584f22cc711ccfdc0d8e26657f40 Reviewed-by: Tomi Korpipää --- src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Authoring') diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp index 82f8428e..e64a3a6f 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp @@ -246,10 +246,8 @@ struct SDocBufferCache : public IDocumentBufferCache return entry->second.m_ImageBuffer; CFilePath thePath(m_Doc.GetResolvedPathToDoc(inPath)); SImageTextureData retval; - if (thePath.IsFile() && GetBufferManager()) { - retval = GetBufferManager()->LoadRenderImage( - GetBufferManager()->GetStringTable().RegisterStr(thePath.toCString())); - } + if (thePath.IsFile() && GetBufferManager()) + retval = GetBufferManager()->LoadRenderImage(thePath.toQString()); if (retval.m_Texture) m_Buffers.insert( make_pair(m_StringTablePtr->RegisterStr(inPath.toCString()), SModelBufferOrImage(retval))); -- cgit v1.2.3