Merge with origin

f3d-app · Dec 17, 2024 · 70ec237 · 70ec237
2 parents 9a0e21e + e002875
commit 70ec237
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -149,6 +149,7 @@ f3d_test(NAME TestVTM DATA mb.vtm UI)
 f3d_test(NAME TestVTK DATA cow.vtk)
 f3d_test(NAME TestNRRD DATA beach.nrrd ARGS -s)
 f3d_test(NAME TestSPLAT DATA small.splat ARGS -osy --up=-Y --point-sprites-size=1)
+f3d_test(NAME TestQuakeMDL DATA glaunch.mdl)
 f3d_test(NAME TestGridX DATA suzanne.ply ARGS -g --up=+X)
 f3d_test(NAME TestGridY DATA suzanne.ply ARGS -g --up=+Y)
 f3d_test(NAME TestGridZ DATA suzanne.ply ARGS -g --up=+Z)

diff --git a/plugins/alembic/module/vtkF3DAlembicReader.h b/plugins/alembic/module/vtkF3DAlembicReader.h
@@ -14,12 +14,11 @@
 #ifndef vtkF3DAlembicReader_h
 #define vtkF3DAlembicReader_h
 
+#include <memory>
 #include <vtkNew.h>
 #include <vtkPolyDataAlgorithm.h>
 #include <vtkVersion.h>
 
-#include <memory>
-
 class vtkF3DAlembicReader : public vtkPolyDataAlgorithm
 {
 public:

diff --git a/plugins/native/configs/config.d/10_native.json b/plugins/native/configs/config.d/10_native.json
@@ -67,7 +67,7 @@
     "grid": false,
     "anti-aliasing": false,
     "translucency-support": false
-  },
+  }
 },
 {
   "match": ".*(mdl)",