haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed timestamp checking code to use canonical filename

This commit is contained in:
Cirilo Bernardo 2016-03-21 07:21:54 +11:00
parent aa16666d72
commit 10c8a57c59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d-viewer/3d_cache/3d_cache.cpp
View File

@ -222,14 +222,14 @@ SCENEGRAPH* S3D_CACHE::load( const wxString& aModelFile, S3D_CACHE_ENTRY** aCach
if( mi != m_CacheMap.end() ) if( mi != m_CacheMap.end() )
{ {
wxFileName fname( aModelFile ); wxFileName fname( full3Dpath );
wxDateTime fmdate = fname.GetModificationTime(); wxDateTime fmdate = fname.GetModificationTime();
bool reload = false; bool reload = false;
if( fmdate != mi->second->modTime ) if( fmdate != mi->second->modTime )
{ {
unsigned char hashSum[20]; unsigned char hashSum[20];
getSHA1( aModelFile, hashSum ); getSHA1( full3Dpath, hashSum );
mi->second->modTime = fmdate; mi->second->modTime = fmdate;
if( !isSHA1Same( hashSum, mi->second->sha1sum ) ) 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 ) if( NULL != mi->second->renderData )
S3D::Destroy3DModel( &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 ) if( NULL != aCachePtr )