Merge branch 'dev' into fishbones

This commit is contained in:
Magne Sjaastad
2017-05-15 13:37:09 +02:00
319 changed files with 3791 additions and 2178 deletions

View File

@@ -39,6 +39,8 @@
#include "RivWellPathPartMgr.h"
#include "cafUtils.h"
#include "cafPdmUiTreeOrdering.h"
#include <QDateTime>
@@ -382,7 +384,7 @@ void RimWellPath::updateFilePathsFromProjectPath(const QString& newProjectPath,
{
QString newCacheFileName = getCacheFileName();
if (QFile::exists(newCacheFileName))
if (caf::Utils::fileExists(newCacheFileName))
{
filepath = newCacheFileName;
}