Merge master

opendm/osfm.py

@@ -299,7 +299,7 @@ class OSFMContext:
             reconstruction_shots = tools.load_reconstruction_shots(meta_data)
             transformations = tools.align_reconstructions(reconstruction_shots,
                                             tools.partial_reconstruction_name,
-                                            True)
+                                            False)
             tools.apply_transformations(transformations)
 
             self.touch(alignment_file)
@@ -579,4 +579,4 @@ def get_all_submodel_paths(submodels_path, *all_paths):
             if all_found:
                 result.append([os.path.join(submodels_path, f, ap) for ap in all_paths])
 
-    return result
+    return result

requirements.txt

@@ -13,8 +13,13 @@ matplotlib==3.3.3
 networkx==2.5
 numpy==1.19.4
 Pillow==8.0.1
+<<<<<<< HEAD
 vmem==1.0.0
 pyodm==1.5.4
+=======
+psutil==5.7.3
+pyodm==1.5.5
+>>>>>>> 1b0f17042e5b0ccf4026f950939e5a2c0b29642a
 pyOpenSSL==19.1.0
 pyproj==3.0.0.post1
 Pysolar==0.9