Merge pull request #610 from mike1158/develop

Bugfix for MESHROOM_SUBMITTERS_PATH env variable
alicevision · Jan 3, 2020 · ff96004 · ff96004
2 parents 82f8429 + 44779f6
commit ff96004
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/meshroom/core/__init__.py b/meshroom/core/__init__.py
@@ -260,10 +260,7 @@ def loadSubmitters(folder, packageName):
 # - Nodes
 loadAllNodes(folder=os.path.join(meshroomFolder, 'nodes'))
 # - Submitters
-subs = loadSubmitters(meshroomFolder, 'submitters')
-# -  additional 3rd party submitters
-if "MESHROOM_SUBMITTERS_PATH" in os.environ:
-    subs += loadSubmitters(os.environ["MESHROOM_SUBMITTERS_PATH"], 'submitters')
+subs = loadSubmitters(os.environ.get("MESHROOM_SUBMITTERS_PATH", meshroomFolder), 'submitters')
 
 for sub in subs:
     registerSubmitter(sub())