From a576fb8ce4aae51c1659e39902ee50211e16b9ad Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 31 Oct 2017 21:21:10 +0100 Subject: [PATCH] [multiview] set inputs only if not empty Avoid errors with None --- meshroom/multiview.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meshroom/multiview.py b/meshroom/multiview.py index a24566c0..d8b5ee18 100644 --- a/meshroom/multiview.py +++ b/meshroom/multiview.py @@ -6,9 +6,13 @@ from .core.graph import Graph def photogrammetryPipeline(inputFolder='', inputImages=[], inputViewpoints=[]): # type: () -> Graph graph = Graph('pipeline') - cameraInit = graph.addNewNode('CameraInit', imageDirectory=inputFolder) - cameraInit.viewpoints.value = [{'image': image, 'focal': -1} for image in inputImages] - cameraInit.viewpoints.extend(inputViewpoints) + cameraInit = graph.addNewNode('CameraInit') + if inputFolder: + cameraInit.imageDirectory.value = inputFolder + if inputImages: + cameraInit.viewpoints.value = [{'image': image, 'focal': -1} for image in inputImages] + if inputViewpoints: + cameraInit.viewpoints.extend(inputViewpoints) featureExtraction = graph.addNewNode('FeatureExtraction', input=cameraInit.outputSfm) imageMatching = graph.addNewNode('ImageMatching',