Merge pull request #2001 from alicevision/dev/expressionVars

fabiencastan · web-flow · commit 6cac70590d7d · 2025-10-02T17:41:32.000+02:00
[meshroom] `CameraInit`: Remove `_cmdVars` As a consequence of alicevision/Meshroom#2888, _cmdVars, which was used in CameraInit, does not exist anymore and node.internalFolder now contains the resolved path. There is thus no need to format it anymore.
diff --git a/meshroom/aliceVision/CameraInit.py b/meshroom/aliceVision/CameraInit.py
@@ -671,7 +671,7 @@ def createViewpointsFile(self, node, additionalViews=()):
                 "featureFolder": "",
                 "matchingFolder": "",
             }
-            node.viewpointsFile = os.path.join(node.internalFolder, 'viewpoints.sfm').format(**node._cmdVars)
+            node.viewpointsFile = os.path.join(node.internalFolder, 'viewpoints.sfm')
             with open(node.viewpointsFile, 'w') as f:
                 json.dump(sfmData, f, indent=4)
 

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ def createViewpointsFile(self, node, additionalViews=()):`
`671`	`671`	`"featureFolder": "",`
`672`	`672`	`"matchingFolder": "",`
`673`	`673`	`}`
`674`		`- node.viewpointsFile = os.path.join(node.internalFolder, 'viewpoints.sfm').format(**node._cmdVars)`
	`674`	`+ node.viewpointsFile = os.path.join(node.internalFolder, 'viewpoints.sfm')`
`675`	`675`	`with open(node.viewpointsFile, 'w') as f:`
`676`	`676`	`json.dump(sfmData, f, indent=4)`
`677`	`677`