Changeset 5791 for vtkvis


Ignore:
Timestamp:
Aug 1, 2015, 1:07:30 PM (9 years ago)
Author:
ldelgass
Message:

merge r5789:r5790 from vtkvis release branch

Location:
vtkvis/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • vtkvis/trunk

  • vtkvis/trunk/HeightMap.cpp

    r5753 r5791  
    746746
    747747    _warpScale = scale;
    748     if (_warp == NULL) {
     748    if (_warp == NULL && scale != 0.0) {
    749749        vtkAlgorithmOutput *warpOutput = initWarp(_mapper->GetInputConnection(0, 0));
    750750        _mapper->SetInputConnection(warpOutput);

  • vtkvis/trunk/protocol.txt

    r4091 r5791  
    879879streamlines edges <bool> <?datasetName?>
    880880            Turn on/off edges for tubes, ribbons
    881 streamlines length <?datasetName?>
     881streamlines length <length> <?datasetName?>
    882882            Set maximum length in world coordinates of streamlines
    883883streamlines lighting <bool> <?datasetName?>
Note: See TracChangeset for help on using the changeset viewer.