Merge branch 'develop' into master

geoflow3d · Mar 8, 2024 · f8c2be4 · f8c2be4
2 parents aa509a6 + fa4d32c
commit f8c2be4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/gfp-basic3d b/plugins/gfp-basic3d
diff --git a/plugins/gfp-building-reconstruction b/plugins/gfp-building-reconstruction
+1 −1		CMakeLists.txt
+2 −3		nodes.hpp
+42 −13		nodes_cityjson.cpp
+7 −4		nodes_gltf.cpp
+3 −2		CMakeLists.txt
+1 −0		register.hpp
+87 −63		src/MeshClipperNode.cpp
+21 −0		src/MeshProcessingNodes.hpp
+187 −2		src/MeshSimplify.cpp
+44 −0		src/heightfield_nodes.cpp
+8 −3		src/polygon_triangulate.cpp
+23 −0		src/polygon_util.cpp
+1 −0		src/polygon_util.hpp
+227 −0		src/tinsimp.cpp
+55 −0		src/tinsimp.hpp
+1 −1		thirdparty/region-grower