Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-27 12:34:52 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-27 12:35:38 +0300
commit9a080d2ea6065b3686089c156cfa72d29744c953 (patch)
treee6c7b3ff3e2ce97bf0c29dc2f070c26ff2ae4308 /intern/cycles/blender/addon/engine.py
parent67e690f5fcc084fbd949240f2c7733854079efc5 (diff)
Fix T56092: command line arguments after -- beginning with -h don't work.
Diffstat (limited to 'intern/cycles/blender/addon/engine.py')
-rw-r--r--intern/cycles/blender/addon/engine.py4
1 files changed, 3 insertions, 1 deletions
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)