Commit c933be88 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'handle_null_dataset'

493b58b3

 GatherV(vtkDataObject*) now handles NULL correctly.

Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1821
parents b509718a 493b58b3
......@@ -1060,10 +1060,6 @@ int vtkCommunicator::GatherV(vtkDataObject *sendData,
int sendType = sendData? sendData->GetDataObjectType() : -1;
switch(sendType)
{
case -1:
// NULL data.
return 1;
//error on types we can't send
case VTK_DATA_OBJECT:
case VTK_DATA_SET:
......@@ -1093,6 +1089,8 @@ int vtkCommunicator::GatherV(vtkDataObject *sendData,
case VTK_UNSTRUCTURED_GRID:
case VTK_MULTIBLOCK_DATA_SET:
case VTK_UNIFORM_GRID_AMR:
case -1:
return this->GatherVElementalDataObject(
sendData, receiveData, destProcessId);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment