Merge branch 'dev' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-04-03 07:34:56 +02:00
181 changed files with 6568 additions and 2318 deletions
@@ -840,6 +840,6 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
uiTreeOrdering.add(scriptCollection());
}
uiTreeOrdering.setForgetRemainingFields(true);
uiTreeOrdering.skipRemainingChildren(true);
}