Skip to content

Commit 52ef1d3

Browse files
committed
[workspace] Upgrade vtk_internal to latest commit
1 parent bd7834f commit 52ef1d3

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[vtk] Restore IO import error forwarding
2+
3+
Feed through the proper observers as opposed to raising globally.
4+
5+
--- IO/Import/vtkGLTFImporter.cxx
6+
+++ IO/Import/vtkGLTFImporter.cxx
7+
@@ -417,6 +417,8 @@ int vtkGLTFImporter::ImportBegin()
8+
vtkNew<vtkEventForwarderCommand> forwarder;
9+
forwarder->SetTarget(this);
10+
this->Loader->AddObserver(vtkCommand::ProgressEvent, forwarder);
11+
+ this->Loader->AddObserver(vtkCommand::WarningEvent, forwarder);
12+
+ this->Loader->AddObserver(vtkCommand::ErrorEvent, forwarder);
13+
14+
// Check extension
15+
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)