Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
Andrew Heather
2018-05-18 12:18:13 +01:00
63 changed files with 745 additions and 438 deletions

View File

@ -122,11 +122,10 @@ void Foam::functionObjects::runTimePostPro::scene::readColours
const dictionary& dict
)
{
const wordList colours = dict.toc();
forAll(colours, i)
const wordList colours(dict.toc());
for (const word& c : colours)
{
const word& c = colours[i];
colours_.insert(c, Function1<vector>::New(c, dict).ptr());
colours_.insert(c, Function1<vector>::New(c, dict));
}
}