Commit f934d745 authored by kgriffin's avatar kgriffin

Merge from 2.11RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@29351 18c085ea-50e0-402c-830e-de6fd14e8384
parent 98f5f42c
......@@ -2376,14 +2376,6 @@ avtXRayFilter::CheckDataSets(int nDataSets, vtkDataSet **dataSets)
int numBins;
cellDataType = -1;
if(nDataSets <= 0)
{
char msg[256];
SNPRINTF(msg,256, "Variables %s and %s resulted in no data being selected.",
absVarName.c_str(), emisVarName.c_str());
EXCEPTION1(VisItException, msg);
}
for (int i = 0; i < nDataSets; i++)
{
vtkDataArray *abs = dataSets[i]->GetCellData()->GetArray(absVarName.c_str());
......
......@@ -1190,14 +1190,6 @@ avtXRayImageQuery::CheckData(vtkDataSet **dataSets, const int nsets)
}
}
if(nsets <= 0)
{
char msg[256];
SNPRINTF(msg,256, "Variables %s and %s resulted in no data being selected.",
absVarName.c_str(), emisVarName.c_str());
EXCEPTION1(VisItException, msg);
}
}
// ****************************************************************************
......
Markdown is supported
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