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

Conflicts:
	meshroom/ui/app.py
This commit is contained in:
Fabien Castan 2020-06-22 17:04:24 +02:00
commit 451f5d65c0
7 changed files with 28 additions and 27 deletions

View file

@ -440,7 +440,6 @@ FocusScope {
active = true;
}
onActiveNodeChanged: {
console.warn("mtracksLoader.onActiveNodeChanged, activeNode: " + activeNode)
if(!isUsed)
active = false;
else if(!isComputed)