Changeset 5753 for vtkvis/trunk


Ignore:
Timestamp:
Jul 17, 2015, 12:04:48 PM (9 years ago)
Author:
ldelgass
Message:

merge fixes from vtkvis release branch

Location:
vtkvis/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • vtkvis/trunk

  • vtkvis/trunk/Contour2D.cpp

    r5073 r5753  
    138138                cellToPtData->SetInput(ds);
    139139#endif
    140                 //cellToPtData->PassCellDataOn();
     140                cellToPtData->PassCellDataOn();
    141141                cellToPtData->Update();
    142142                ds = cellToPtData->GetOutput();

  • vtkvis/trunk/Contour3D.cpp

    r5073 r5753  
    133133                cellToPtData->SetInput(ds);
    134134#endif
    135                 //cellToPtData->PassCellDataOn();
     135                cellToPtData->PassCellDataOn();
    136136                cellToPtData->Update();
    137137                ds = cellToPtData->GetOutput();

  • vtkvis/trunk/HeightMap.cpp

    r5073 r5753  
    241241                cellToPtData->SetInput(ds);
    242242#endif
    243                 //cellToPtData->PassCellDataOn();
     243                cellToPtData->PassCellDataOn();
    244244                cellToPtData->Update();
    245245                ds = cellToPtData->GetOutput();

  • vtkvis/trunk/Streamlines.cpp

    r5073 r5753  
    491491            cellToPtData->SetInput(ds);
    492492#endif
    493             //cellToPtData->PassCellDataOn();
     493            cellToPtData->PassCellDataOn();
    494494            cellToPtData->Update();
    495495            ds = cellToPtData->GetOutput();

  • vtkvis/trunk/Warp.cpp

    r5073 r5753  
    122122            cellToPtData->SetInput(ds);
    123123#endif
    124             //cellToPtData->PassCellDataOn();
     124            cellToPtData->PassCellDataOn();
    125125            cellToPtData->Update();
    126126            ds = cellToPtData->GetOutput();

  • vtkvis/trunk/configure

    r4595 r5753  
    41444144fi
    41454145
    4146 # We are assuming that we're using VTK 6.0
     4146# There can be multiple versions of VTK installed side-by-side
    41474147VTK_VERSION=6.1
    41484148VTK_LIB_DIR=${libdir}

  • vtkvis/trunk/configure.in

    r4595 r5753  
    103103fi
    104104
    105 # We are assuming that we're using VTK 6.0
     105# There can be multiple versions of VTK installed side-by-side
    106106VTK_VERSION=6.1
    107107VTK_LIB_DIR=${libdir}
    … …  
    116116fi
    117117
    118 dnl Prefer our VTK installation over systems. --with-vtk overrides.
    119118if test "x$with_vtk" != "x" ; then
    120119   VTK_VERSION=$with_vtk
Note: See TracChangeset for help on using the changeset viewer.