From 5e98c9427b80e00b9954cab590187916e9dd170e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 16:05:19 +0100 Subject: [PATCH 1/4] Update current version from "2024.1.0" to "2025.1.0" --- meshroom/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/__init__.py b/meshroom/__init__.py index b9f080eb02..5104301a6c 100644 --- a/meshroom/__init__.py +++ b/meshroom/__init__.py @@ -10,7 +10,7 @@ class VersionStatus(Enum): develop = 2 -__version__ = "2024.1.0" +__version__ = "2025.1.0" # Always increase the minor version when switching from release to develop. __version_status__ = VersionStatus.develop From 63b8d319e0ee1f1a185b9f3ae98dbb5beaa53c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 16:05:33 +0100 Subject: [PATCH 2/4] [docs] Update copyrights --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 378ca80188..cf22c9c991 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,7 +16,7 @@ sys.path.append(os.path.abspath('./_ext')) project = 'Meshroom' -copyright = '2023, AliceVision Association' +copyright = '2025, AliceVision Association' author = 'AliceVision Association' # -- General configuration --------------------------------------------------- From 70dd025623b273ee2c93e363e1fb75fd1aea85d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 16:05:52 +0100 Subject: [PATCH 3/4] [ui] "About" dialog: Update copyrights --- meshroom/ui/qml/AboutDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshroom/ui/qml/AboutDialog.qml b/meshroom/ui/qml/AboutDialog.qml index ed25fde087..bab7d76c5a 100644 --- a/meshroom/ui/qml/AboutDialog.qml +++ b/meshroom/ui/qml/AboutDialog.qml @@ -126,7 +126,7 @@ Dialog { font.pointSize: 10 } Label { - text: "2010-2023 AliceVision contributors" + text: "2010-2025 AliceVision contributors" } } From 5f8b531446b813699904e2a4ceb03060b09362c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 6 Jan 2025 16:06:40 +0100 Subject: [PATCH 4/4] [pipelines] Update release version to "2025.1.0" for all templates --- meshroom/pipelines/cameraTracking.mg | 2 +- meshroom/pipelines/cameraTrackingWithoutCalibration.mg | 2 +- meshroom/pipelines/distortionCalibration.mg | 2 +- meshroom/pipelines/hdrFusion.mg | 2 +- meshroom/pipelines/multi-viewPhotometricStereo.mg | 2 +- meshroom/pipelines/nodalCameraTracking.mg | 2 +- meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg | 2 +- meshroom/pipelines/panoramaFisheyeHdr.mg | 2 +- meshroom/pipelines/panoramaHdr.mg | 2 +- meshroom/pipelines/photogrammetry.mg | 2 +- meshroom/pipelines/photogrammetryAndCameraTracking.mg | 2 +- meshroom/pipelines/photogrammetryDraft.mg | 2 +- meshroom/pipelines/photometricStereo.mg | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index c8f636a4f4..81c7668b4b 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg index d7cecb7eac..42fd43c549 100644 --- a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/distortionCalibration.mg b/meshroom/pipelines/distortionCalibration.mg index 6c13ae5d12..f3589277fb 100644 --- a/meshroom/pipelines/distortionCalibration.mg +++ b/meshroom/pipelines/distortionCalibration.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/hdrFusion.mg b/meshroom/pipelines/hdrFusion.mg index 78e518a830..fb38ea2b73 100644 --- a/meshroom/pipelines/hdrFusion.mg +++ b/meshroom/pipelines/hdrFusion.mg @@ -7,7 +7,7 @@ "LdrToHdrSampling": "4.0", "Publish": "1.3" }, - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true }, diff --git a/meshroom/pipelines/multi-viewPhotometricStereo.mg b/meshroom/pipelines/multi-viewPhotometricStereo.mg index 5553994bbd..5a87ee7016 100644 --- a/meshroom/pipelines/multi-viewPhotometricStereo.mg +++ b/meshroom/pipelines/multi-viewPhotometricStereo.mg @@ -1,7 +1,7 @@ { "header": { "pipelineVersion": "2.2", - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg index a183d2d660..740492618f 100644 --- a/meshroom/pipelines/nodalCameraTracking.mg +++ b/meshroom/pipelines/nodalCameraTracking.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg index 16b7d7dc4d..ab99676f02 100644 --- a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg index 764b204aba..d796195728 100644 --- a/meshroom/pipelines/panoramaFisheyeHdr.mg +++ b/meshroom/pipelines/panoramaFisheyeHdr.mg @@ -19,7 +19,7 @@ "Publish": "1.3", "SfMTransform": "3.1" }, - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true }, diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg index 4d67f0f3fe..f3184cf19f 100644 --- a/meshroom/pipelines/panoramaHdr.mg +++ b/meshroom/pipelines/panoramaHdr.mg @@ -19,7 +19,7 @@ "Publish": "1.3", "SfMTransform": "3.1" }, - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true }, diff --git a/meshroom/pipelines/photogrammetry.mg b/meshroom/pipelines/photogrammetry.mg index cc6181fd40..54e615fb0a 100644 --- a/meshroom/pipelines/photogrammetry.mg +++ b/meshroom/pipelines/photogrammetry.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index c8969b20bf..c52aa0b637 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": { diff --git a/meshroom/pipelines/photogrammetryDraft.mg b/meshroom/pipelines/photogrammetryDraft.mg index 6e41617d24..50a494c018 100644 --- a/meshroom/pipelines/photogrammetryDraft.mg +++ b/meshroom/pipelines/photogrammetryDraft.mg @@ -12,7 +12,7 @@ "StructureFromMotion": "3.3", "Texturing": "6.0" }, - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true }, diff --git a/meshroom/pipelines/photometricStereo.mg b/meshroom/pipelines/photometricStereo.mg index 9a76d73794..6bf2faa8e0 100644 --- a/meshroom/pipelines/photometricStereo.mg +++ b/meshroom/pipelines/photometricStereo.mg @@ -1,6 +1,6 @@ { "header": { - "releaseVersion": "2024.1.0-develop", + "releaseVersion": "2025.1.0-develop", "fileVersion": "2.0", "template": true, "nodesVersions": {