Merge branch 'dev' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-06-08 14:09:03 +02:00
80 changed files with 913 additions and 521 deletions

View File

@@ -64,7 +64,7 @@ void RicConvertAllFractureTemplatesToMetricFeature::onActionTriggered(bool isChe
for (auto ellipseFracTemplate : ellipseFracTemplates)
{
if (ellipseFracTemplate->fractureTemplateUnit == RimDefines::UNITS_FIELD)
if (ellipseFracTemplate->fractureTemplateUnit == RimUnitSystem::UNITS_FIELD)
{
ellipseFracTemplate->changeUnits();
}