Porting to VTK 6.

[modules/visu.git] / src / CONVERTOR / VISU_MergeFilterUtilities.cxx

diff --git a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
index cd80e81e8940ed08566551705f5003512203ff4a..83d61637e6fdded3eb6b8b138115182a9d1edc5c 100644 (file)
--- a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
+++ b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
@@ -230,6 +230,8 @@ namespace
                    VISU::TFieldList* theFieldList,
                    TDataSet *theOutput)
   {
+    if(!theGeometryPointMapper || !theDataPointMapper)
+      return;
     if(IsDifferent(theGeometryPointMapper, theDataPointMapper)){
       TObjectId2TupleIdMap aDataObjectId2PointIdMap;
       GetObjectId2TupleIdMap(theDataPointMapper, aDataObjectId2PointIdMap);
@@ -624,8 +626,8 @@ namespace
       if(vtkDataArray *aCellMapper = aCellData->GetArray("VISU_CELLS_MAPPER")){
         bool anIsDataOnCells = false;
         if(vtkDataSet* aDataSet = theScalarsDataSet)
-          if(vtkCellData* aCellData = aDataSet->GetCellData())
-            anIsDataOnCells = (aCellData->GetArray("VISU_FIELD") != NULL);
+          if(vtkCellData* aCellData1 = aDataSet->GetCellData())
+            anIsDataOnCells = (aCellData1->GetArray("VISU_FIELD") != NULL);
         if(anIsDataOnCells){
           vtkIntArray *aGeometryCellMapper = dynamic_cast<vtkIntArray*>(aCellMapper);
           vtkIntArray* aDataCellMapper = GetIDMapper(theFieldList,