[Bf-blender-cvs] [9a080d2ea60] master: Fix T56092: command line arguments after -- beginning with -h don't work.

Brecht Van Lommel noreply at git.blender.org
Fri Jul 27 11:41:00 CEST 2018


Commit: 9a080d2ea6065b3686089c156cfa72d29744c953
Author: Brecht Van Lommel
Date:   Fri Jul 27 11:34:52 2018 +0200
Branches: master
https://developer.blender.org/rB9a080d2ea6065b3686089c156cfa72d29744c953

Fix T56092: command line arguments after -- beginning with -h don't work.

===================================================================

M	intern/cycles/blender/addon/engine.py

===================================================================

diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 08c6a65e5ad..7e06b15afdd 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -52,7 +52,9 @@ def _workaround_buggy_drivers():
 
 def _configure_argument_parser():
     import argparse
-    parser = argparse.ArgumentParser(description="Cycles Addon argument parser")
+    # No help because it conflicts with general Python scripts argument parsing
+    parser = argparse.ArgumentParser(description="Cycles Addon argument parser",
+                                     add_help=False)
     parser.add_argument("--cycles-resumable-num-chunks",
                         help="Number of chunks to split sample range into",
                         default=None)



More information about the Bf-blender-cvs mailing list