From 10c8a57c59b9b47cd4de3a4830ca26f1a42a5d4f Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Mon, 21 Mar 2016 07:21:54 +1100 Subject: [PATCH] Fixed timestamp checking code to use canonical filename --- 3d-viewer/3d_cache/3d_cache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp index 8d9d00ca70..70b9f95e0c 100644 --- a/3d-viewer/3d_cache/3d_cache.cpp +++ b/3d-viewer/3d_cache/3d_cache.cpp @@ -222,14 +222,14 @@ SCENEGRAPH* S3D_CACHE::load( const wxString& aModelFile, S3D_CACHE_ENTRY** aCach if( mi != m_CacheMap.end() ) { - wxFileName fname( aModelFile ); + wxFileName fname( full3Dpath ); wxDateTime fmdate = fname.GetModificationTime(); bool reload = false; if( fmdate != mi->second->modTime ) { unsigned char hashSum[20]; - getSHA1( aModelFile, hashSum ); + getSHA1( full3Dpath, hashSum ); mi->second->modTime = fmdate; if( !isSHA1Same( hashSum, mi->second->sha1sum ) ) @@ -250,7 +250,7 @@ SCENEGRAPH* S3D_CACHE::load( const wxString& aModelFile, S3D_CACHE_ENTRY** aCach if( NULL != mi->second->renderData ) S3D::Destroy3DModel( &mi->second->renderData ); - mi->second->sceneData = m_Plugins->Load3DModel(aModelFile, mi->second->pluginInfo); + mi->second->sceneData = m_Plugins->Load3DModel( full3Dpath, mi->second->pluginInfo ); } if( NULL != aCachePtr )