New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vtk master bump #1357

Merged
merged 3 commits into from Jun 3, 2015

Conversation

Projects
None yet
2 participants
@doutriaux1
Member

doutriaux1 commented Jun 2, 2015

recreating PR because was merged too early

goes with: CDAT/uvcdat-testdata#53
CDAT/VTK#5

allisonvacanti added some commits May 27, 2015

Remove vcs2vtk.stripGrid.
This requires a change in VTK that skips blanked cells in vtkGlyph2D. It
is needed since the blanking mechanism has changed.
Update vcs2vtk.putMaskOnVTKGrid to reflect blanking changes in VTK.
All blanking information is now stored by setting bits on the
corresponding element in a field data array.
@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jun 2, 2015

@dlonie when you updated PR CDAT/VTK#5 feel free to merge this one and the uvcdat-testdata

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Jun 3, 2015

Okeydoke, just wanted to make sure we were on the same page before I went ahead with that.

allisonvacanti added a commit that referenced this pull request Jun 3, 2015

@allisonvacanti allisonvacanti merged commit c942ff0 into master Jun 3, 2015

2 of 4 checks passed

continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
continuous-integration/kitware-buildbot/uvcdat-test-laptop-linux-release/ Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@doutriaux1 doutriaux1 referenced this pull request Jun 3, 2015

Merged

Vtk master bump #1348

@allisonvacanti allisonvacanti deleted the vtk-master-bump branch Jun 4, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment