Merge pull request #1948 from alicevision/rc3.3.0

fabiencastan · web-flow · commit 928bac268946 · 2025-08-19T10:44:45.000+02:00
Release 3.3.0
diff --git a/CHANGES.md b/CHANGES.md
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -7,9 +7,13 @@ Individuals
 -----------
 
 - Abdelrahman Al Marouk
+- Alice Sonolet
+- balloonalpha
 - Candice Bentejac
 - Carsten Griwodz
+- Cedric Thebault
 - Cenek Albl
+- c-ewing
 - Clement Aymard
 - Clement Debize
 - Cyril Pichard
@@ -18,15 +22,19 @@ Individuals
 - Fabien Servant
 - Gregoire De Lillo
 - Havard Espeland
+- JackBoosY
 - Jean Melou
 - Julien Haudegond
 - Lilian Calvet
 - Loic Vital
+- luzpaz
 - Michal Polic
+- Matthieu Hog
 - Nicolas Rondaud
 - Pierre Gurdjos
 - Povilas Kanapickas
 - Simone Gasparini
+- Sylvain Maziere
 - Théo Leplomb
 - Tomas Pajdla
 - Vincent Demoulin
diff --git a/RELEASING.md b/RELEASING.md
@@ -25,7 +25,7 @@ Tags
      - Push updates to https://hub.docker.com/r/alicevision/alicevision-deps/tags
    - Check vcpkg
      - Update https://github.com/alicevision/vcpkg branch: alicevision_master
-     - Upload result on gdrive and update INSTALL.md
+     - Release result on GitHub repo and update INSTALL.md
    - Update INSTALL.md
      - Update minimal versions if needed
      - Update vcpkg install command if needed
diff --git a/meshroom/cameraTracking.mg b/meshroom/cameraTracking.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/cameraTrackingExperimental.mg b/meshroom/cameraTrackingExperimental.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/cameraTrackingWithoutCalibration.mg b/meshroom/cameraTrackingWithoutCalibration.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/cameraTrackingWithoutCalibrationExperimental.mg b/meshroom/cameraTrackingWithoutCalibrationExperimental.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/colorCalibration.mg b/meshroom/colorCalibration.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/distortionCalibration.mg b/meshroom/distortionCalibration.mg
@@ -1,15 +1,15 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "CameraInit": "12.0",
             "CheckerboardDetection": "1.0",
             "DistortionCalibration": "6.0",
             "ExportDistortion": "2.0",
             "Publish": "1.3"
-        }
+        },
+        "template": true
     },
     "graph": {
         "CameraInit_1": {
diff --git a/meshroom/hdrFusion.mg b/meshroom/hdrFusion.mg
@@ -1,14 +1,14 @@
 {
     "header": {
+        "releaseVersion": "2025.1.0",
+        "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
             "LdrToHdrCalibration": "3.1",
             "LdrToHdrMerge": "4.1",
             "LdrToHdrSampling": "4.0",
             "Publish": "1.3"
         },
-        "releaseVersion": "2025.1.0-develop",
-        "fileVersion": "2.0",
         "template": true
     },
     "graph": {
diff --git a/meshroom/lidarMeshing.mg b/meshroom/lidarMeshing.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ImportE57": "1.0",
diff --git a/meshroom/multi-viewPhotometricStereo.mg b/meshroom/multi-viewPhotometricStereo.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/nodalCameraTracking.mg b/meshroom/nodalCameraTracking.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/nodalCameraTrackingWithoutCalibration.mg b/meshroom/nodalCameraTrackingWithoutCalibration.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/panoramaFisheyeHdr.mg b/meshroom/panoramaFisheyeHdr.mg
@@ -1,5 +1,7 @@
 {
     "header": {
+        "releaseVersion": "2025.1.0",
+        "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
             "FeatureExtraction": "1.3",
@@ -19,8 +21,6 @@
             "Publish": "1.3",
             "SfMTransform": "3.1"
         },
-        "releaseVersion": "2025.1.0-develop",
-        "fileVersion": "2.0",
         "template": true
     },
     "graph": {
diff --git a/meshroom/panoramaHdr.mg b/meshroom/panoramaHdr.mg
@@ -1,5 +1,7 @@
 {
     "header": {
+        "releaseVersion": "2025.1.0",
+        "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
             "FeatureExtraction": "1.3",
@@ -19,8 +21,6 @@
             "Publish": "1.3",
             "SfMTransform": "3.1"
         },
-        "releaseVersion": "2025.1.0-develop",
-        "fileVersion": "2.0",
         "template": true
     },
     "graph": {
diff --git a/meshroom/photogrammetry.mg b/meshroom/photogrammetry.mg
@@ -1,8 +1,7 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "CameraInit": "12.0",
             "DepthMap": "5.0",
@@ -16,7 +15,8 @@
             "Publish": "1.3",
             "StructureFromMotion": "3.3",
             "Texturing": "6.0"
-        }
+        },
+        "template": true
     },
     "graph": {
         "CameraInit_1": {
diff --git a/meshroom/photogrammetryAndCameraTracking.mg b/meshroom/photogrammetryAndCameraTracking.mg
@@ -1,8 +1,7 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "ApplyCalibration": "1.0",
             "CameraInit": "12.0",
@@ -28,7 +27,8 @@
             "ScenePreview": "2.0",
             "StructureFromMotion": "3.3",
             "Texturing": "6.0"
-        }
+        },
+        "template": true
     },
     "graph": {
         "ApplyCalibration_1": {
diff --git a/meshroom/photogrammetryAndCameraTrackingExperimental.mg b/meshroom/photogrammetryAndCameraTrackingExperimental.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "ApplyCalibration": "1.0",
diff --git a/meshroom/photogrammetryDraft.mg b/meshroom/photogrammetryDraft.mg
@@ -1,5 +1,7 @@
 {
     "header": {
+        "releaseVersion": "2025.1.0",
+        "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
             "FeatureExtraction": "1.3",
@@ -12,8 +14,6 @@
             "StructureFromMotion": "3.3",
             "Texturing": "6.0"
         },
-        "releaseVersion": "2025.1.0-develop",
-        "fileVersion": "2.0",
         "template": true
     },
     "graph": {
diff --git a/meshroom/photogrammetryExperimental.mg b/meshroom/photogrammetryExperimental.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/photogrammetryObject.mg b/meshroom/photogrammetryObject.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/photogrammetryObjectTurntable.mg b/meshroom/photogrammetryObjectTurntable.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/photogrammetryObjectTwoSides.mg b/meshroom/photogrammetryObjectTwoSides.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/meshroom/photometricStereo.mg b/meshroom/photometricStereo.mg
@@ -1,15 +1,15 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
-        "template": true,
         "nodesVersions": {
             "CameraInit": "12.0",
             "LightingCalibration": "1.0",
             "PhotometricStereo": "1.0",
             "Publish": "1.3",
             "SphereDetection": "1.0"
-        }
+        },
+        "template": true
     },
     "graph": {
         "CameraInit_1": {
diff --git a/meshroom/rawImageConversion.mg b/meshroom/rawImageConversion.mg
@@ -1,6 +1,6 @@
 {
     "header": {
-        "releaseVersion": "2025.1.0-develop",
+        "releaseVersion": "2025.1.0",
         "fileVersion": "2.0",
         "nodesVersions": {
             "CameraInit": "12.0",
diff --git a/src/aliceVision/version.hpp b/src/aliceVision/version.hpp
@@ -14,7 +14,7 @@
 
 // Version status could be "release" or "develop".
 // When moving from release to develop, always increment the minor version.
-#define ALICEVISION_VERSION_STATUS "develop"
+#define ALICEVISION_VERSION_STATUS "release"
 
 // Preprocessor to string conversion
 #define ALICEVISION_TO_STRING_HELPER(x) #x

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"header": {`
`3`		`- "releaseVersion": "2025.1.0-develop",`
	`3`	`+ "releaseVersion": "2025.1.0",`
`4`	`4`	`"fileVersion": "2.0",`
`5`	`5`	`"nodesVersions": {`
`6`	`6`	`"ApplyCalibration": "1.0",`