[nodes] CameraInit: remove extra outputSfM + fix sfmData for empty filepaths

This commit is contained in:
Yann Lanthony 2017-11-08 18:43:27 +01:00
parent 80cad9386a
commit 2b73e0d80c

View file

@ -130,14 +130,6 @@ class CameraInit(desc.CommandLineNode):
value='{cache}/{nodeType}/{uid0}', # TODO value='{cache}/{nodeType}/{uid0}', # TODO
uid=[], uid=[],
), ),
desc.File( # TODO: TO REMOVE
name='outputSfM',
label='Output SfM',
description='''Output SfMData.''',
value='{cache}/{nodeType}/{uid0}/sfm_data.json',
uid=[],
group="",
),
desc.File( desc.File(
name='outputSfm', name='outputSfm',
label='Output SfM', label='Output SfM',
@ -208,7 +200,7 @@ class CameraInit(desc.CommandLineNode):
""" """
if node.viewpoints: if node.viewpoints:
sfmData = { sfmData = {
"resources": [v["image"] for v in node.viewpoints.getPrimitiveValue(exportDefault=False)], "resources": [v.get("image", "") for v in node.viewpoints.getPrimitiveValue(exportDefault=False)],
} }
node.viewpointsFile = '{cache}/{nodeType}/{uid0}/viewpoints.json'.format(**node._cmdVars) node.viewpointsFile = '{cache}/{nodeType}/{uid0}/viewpoints.json'.format(**node._cmdVars)
with open(node.viewpointsFile, 'w') as f: with open(node.viewpointsFile, 'w') as f: