Merge branch 'main' into devel · cnr-isti-vclab/PyMeshLab@8502c77

Commit

Merge branch 'main' into devel

# Conflicts:
#	src/meshlab

alemuntoni committed Nov 18, 2024

2 parents 60f7486 + ef9d041 commit 8502c77

+1 −0		.devcontainer/Dockerfile
+2 −1		.devcontainer/docker-compose.yml
+3 −1		src/common/utilities/eigen_mesh_conversions.cpp
+30 −2		src/common/utilities/load_save.cpp
+1 −1		src/common/utilities/load_save.h
+1 −0		src/meshlab/glarea.cpp
+10 −4		src/meshlab/images/onscreenHelp.txt
+7 −4		src/meshlab/layerDialog.cpp
+1 −1		src/meshlab/mainwindow_RunTime.cpp
+2 −2		src/meshlabplugins/filter_geodesic/filter_geodesic.cpp
+50 −90		src/meshlabplugins/filter_mesh_alpha_wrap/filter_mesh_alpha_wrap.cpp
+34 −16		src/meshlabplugins/filter_meshing/meshfilter.cpp
+10 −2		src/meshlabplugins/filter_texture/filter_texture.cpp
+2 −0		src/meshlabplugins/io_gltf/gltf_loader.cpp
+1 −1		src/vcglib