Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into VERSION_file_removal

Browse Source
This commit is contained in:
Jan Möbius
2021-01-20 13:02:13 +01:00
parent aab142f094 7d7f685424
commit b7dec01397
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/Windows.bat
View File

@@ -120,7 +120,7 @@ IF EXIST %QT_INSTALL_PATH%\ (
) )
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% .. "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD" %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD"

11
src/OpenMesh/Core/Utils/PropertyManager.hh
View File

@@ -593,6 +593,17 @@ class PropertyManager {
src.copy_to(src_range, dst, dst_range); src.copy_to(src_range, dst, dst_range);
} }
/**
* Mark whether this property should be stored when mesh is written
* to a file
*
* @param _persistence Property will be stored iff _persistence is true
*/
void set_persistent(bool _persistence = true)
{
mesh().property(getRawProperty()).set_persistent(_persistence);
}
private: private:
void deleteProperty() { void deleteProperty() {
if (!retain_ && prop_.is_valid()) if (!retain_ && prop_.is_valid())

2
src/Unittests/CMakeLists.txt
View File

@@ -30,6 +30,8 @@ if ( OPENMESH_BUILD_UNIT_TESTS )
if (TARGET Eigen3::Eigen) if (TARGET Eigen3::Eigen)
add_definitions( -DENABLE_EIGEN3_TEST ) add_definitions( -DENABLE_EIGEN3_TEST )
link_libraries(Eigen3::Eigen) link_libraries(Eigen3::Eigen)
else()
message(WARNING "Eigen3 not found! This will skip the Eigen3 Unittests. You can point cmake to Eigen3 by setting Eigen3_DIR to the cmake files of Eigen3")
endif() endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )