Fix usd capsule version (#1786)

* usd: Fix vtkCapsuleSource include * vtk: Update SHA
f3d-app · Dec 13, 2024 · 23c49b6 · 23c49b6
1 parent 9d08a55
commit 23c49b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/actions/vtk_commit_sha b/.github/actions/vtk_commit_sha
@@ -1 +1 @@
-cd73b5dd854a6ff826e729a6cb890101717498e7
+d085bfba2e97c65a031daacae3499c051bb8f18b
diff --git a/plugins/usd/module/vtkF3DUSDImporter.cxx b/plugins/usd/module/vtkF3DUSDImporter.cxx
@@ -3,7 +3,6 @@
 #include "vtkF3DFaceVaryingPointDispatcher.h"
 
 #include <vtkActor.h>
-#include <vtkCapsuleSource.h>
 #include <vtkConeSource.h>
 #include <vtkCubeSource.h>
 #include <vtkCylinderSource.h>
@@ -33,6 +32,11 @@
 #include <vtkTransform.h>
 #include <vtkTransformFilter.h>
 #include <vtkTriangleFilter.h>
+#include <vtkVersion.h>
+
+#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9, 3, 0)
+#include <vtkCapsuleSource.h>
+#endif
 
 #if defined(__clang__)
 #pragma clang diagnostic push
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		cd73b5dd854a6ff826e729a6cb890101717498e7
		d085bfba2e97c65a031daacae3499c051bb8f18b