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

@ -56,7 +56,7 @@ Many cameras are contributing to the low frequencies and only the best ones cont
name='downscale',
label='Texture Downscale',
description='''Texture downscale factor''',
value=1,
value=2,
values=(1, 2, 4, 8),
exclusive=True,
uid=[0],