Merging master, fixing wmake/rules conflict.

This commit is contained in:
graham
2009-09-21 11:21:06 +01:00
130 changed files with 73784 additions and 463 deletions

View File

@ -108,11 +108,7 @@ int main(int argc, char *argv[])
{
const polyPatch& patch = bMesh[patchI];
if
(
includeProcPatches
|| (patch.type() != processorPolyPatch::typeName)
)
if (includeProcPatches || !isA<processorPolyPatch>(patch))
{
includePatches.insert(patchI);
}