Merge branch 'develop' of github.com:alicevision/meshroom into dev/nodesAndTaskManager

Conflicts:
	meshroom/core/graph.py
	meshroom/ui/qml/main.qml
This commit is contained in:
Fabien Castan 2020-12-01 20:02:43 +01:00
commit 1102ce84e0
61 changed files with 1241 additions and 345 deletions

View file

@ -1204,3 +1204,4 @@ def loadGraph(filepath):
graph.load(filepath)
graph.update()
return graph