Merge branch 'main' into devel · cnr-isti-vclab/PyMeshLab@3b4b204

Commit

Merge branch 'main' into devel

# Conflicts:
#	src/meshlab

alemuntoni committed Dec 12, 2023

2 parents c5bbec1 + f4600f5 commit 3b4b204

+1 −1		.github/actions/1_build/action.yml
+1 −1		.github/workflows/BuildMeshLab.yml
+1 −25		.github/workflows/CreateRelease.yml
+2 −2		scripts/Linux/0_setup_env.sh
+1 −0		src/CMakeLists.txt
+8 −6		src/external/cgal.cmake
+22 −0		src/meshlab/dialogs/save_snapshot_dialog.cpp
+4 −0		src/meshlab/dialogs/save_snapshot_dialog.h
+31 −3		src/meshlab/dialogs/save_snapshot_dialog.ui
+7 −4		src/meshlab/glarea.cpp
+3 −1		src/meshlab/snapshotsetting.h
+14 −0		src/meshlabplugins/filter_mesh_alpha_wrap/CMakeLists.txt
+319 −0		src/meshlabplugins/filter_mesh_alpha_wrap/filter_mesh_alpha_wrap.cpp
+73 −0		src/meshlabplugins/filter_mesh_alpha_wrap/filter_mesh_alpha_wrap.h
+1 −1		src/vcglib