Skip to content

Commit 35e3bc4

Browse files
committed
[workspace] Upgrade vtk_internal to latest commit
1 parent bd7834f commit 35e3bc4

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[vtk] Partially revert upstream commit de160283
2+
3+
Upstream deleted important error handling that TRI added, and it should be put
4+
back. Until that happens, we can unrevert the deletion using this patch file.
5+
6+
When this patch is upstreamed again next time, the VTK team should be sure to
7+
also add a unit test so that it doesn't get reverted again.
8+
9+
Original description of the fix that got reverted: be sure to forward warnings
10+
and errors from the loader that's nested inside the importer back to the
11+
importer proper.
12+
13+
--- IO/Import/vtkGLTFImporter.cxx
14+
+++ IO/Import/vtkGLTFImporter.cxx
15+
@@ -417,6 +417,8 @@ int vtkGLTFImporter::ImportBegin()
16+
vtkNew<vtkEventForwarderCommand> forwarder;
17+
forwarder->SetTarget(this);
18+
this->Loader->AddObserver(vtkCommand::ProgressEvent, forwarder);
19+
+ this->Loader->AddObserver(vtkCommand::WarningEvent, forwarder);
20+
+ this->Loader->AddObserver(vtkCommand::ErrorEvent, forwarder);
21+
22+
// Check extension
23+
std::vector<char> glbBuffer;

tools/workspace/vtk_internal/repository.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ def vtk_internal_repository(
184184
# TODO(jwnimmer-tri) Once there's a tagged release with support for
185185
# VTK_ABI_NAMESPACE, we should switch to an official version number
186186
# here. That probably means waiting for the VTK 10 release.
187-
commit = "4200a02757df119c8c4ca8a66f1e52729522b1f5",
188-
sha256 = "8e2c070127586d5e9d0c3cdd33ca87b08a7dd5b21237922576cb1d1f4d0e7631", # noqa
187+
commit = "02b9b138d3a12cf594e8d393b92a390f762c799f",
188+
sha256 = "aa2061f67119c8cca332a205db560bb59619578fe802d6d29527c2542975ec6a", # noqa
189189
build_file = ":package.BUILD.bazel",
190190
patches = [
191191
# Drake's conventions for VTK patches are:
@@ -197,6 +197,7 @@ def vtk_internal_repository(
197197
# - Use alphabetical order within a directory when listing patches.
198198
":patches/upstream/common_core_rm_iostream.patch",
199199
":patches/upstream/io_geometry_gltf_default_scene.patch",
200+
":patches/upstream/io_import_errors.patch",
200201
":patches/upstream/rendering_opengl2_scaled_albedo_for_ibl.patch",
201202
":patches/upstream/vtkpugixml_global_ctor.patch",
202203
":patches/common_core_nobacktrace.patch",

0 commit comments

Comments
 (0)