Commit 50d8c3a8 authored by Ken Martin's avatar Ken Martin
Browse files

fixes from the main tree

parent 03a14aa9
......@@ -29,7 +29,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkCutter, "1.76");
vtkCxxRevisionMacro(vtkCutter, "1.76.6.1");
vtkStandardNewMacro(vtkCutter);
vtkCxxSetObjectMacro(vtkCutter,CutFunction,vtkImplicitFunction);
......@@ -103,7 +103,6 @@ void vtkCutter::Execute()
if ( input->GetNumberOfPoints() < 1 )
{
vtkErrorMacro("Input data set is empty");
return;
}
......
......@@ -24,7 +24,7 @@
#include "vtkPolyData.h"
#include "vtkPolyLine.h"
vtkCxxRevisionMacro(vtkRibbonFilter, "1.74");
vtkCxxRevisionMacro(vtkRibbonFilter, "1.74.2.1");
vtkStandardNewMacro(vtkRibbonFilter);
// Construct ribbon so that width is 0.1, the width does
......@@ -92,7 +92,6 @@ void vtkRibbonFilter::Execute()
!(inLines = input->GetLines()) ||
(numLines = inLines->GetNumberOfCells()) < 1 )
{
vtkWarningMacro(<< " No input data!");
return;
}
......
......@@ -25,7 +25,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
vtkCxxRevisionMacro(vtkPStreamTracer, "1.11");
vtkCxxRevisionMacro(vtkPStreamTracer, "1.11.6.1");
vtkCxxSetObjectMacro(vtkPStreamTracer, Controller, vtkMultiProcessController);
vtkCxxSetObjectMacro(vtkPStreamTracer,
......@@ -339,11 +339,14 @@ void vtkPStreamTracer::Execute()
append->AddInput(inp);
}
}
if (append->GetNumberOfInputs() > 0)
{
append->Update();
vtkPolyData* appoutput = append->GetOutput();
output->CopyStructure(appoutput);
output->GetPointData()->PassData(appoutput->GetPointData());
output->GetCellData()->PassData(appoutput->GetCellData());
}
append->Delete();
this->TmpOutputs.erase(this->TmpOutputs.begin(), this->TmpOutputs.end());
......
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