[Bf-blender-cvs] [e1a3c1d] asset-experiments: Arg, missed those in previous 'review' commit.
Bastien Montagne
noreply at git.blender.org
Wed Jun 3 17:08:10 CEST 2015
Commit: e1a3c1d4e7ffe10ebe11a156be093dbb730cf5ff
Author: Bastien Montagne
Date: Wed Jun 3 16:29:03 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBe1a3c1d4e7ffe10ebe11a156be093dbb730cf5ff
Arg, missed those in previous 'review' commit.
===================================================================
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
M release/scripts/startup/bl_operators/file.py
===================================================================
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index f565277..ad6ca74 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -428,11 +428,11 @@ def main():
return
import sys
- back_argv = sys.argv
+ import argparse
+
# Get rid of Blender args!
- sys.argv = sys.argv[sys.argv.index("--") + 1:]
+ argv = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
- import argparse
parser = argparse.ArgumentParser(description="Use Blender to generate previews for currently open Blender file's items.")
parser.add_argument('--clear', default=False, action="store_true", help="Clear previews instead of generating them.")
parser.add_argument('--no_scenes', default=True, action="store_false", help="Do not generate/clear previews for scene IDs.")
@@ -440,17 +440,17 @@ def main():
parser.add_argument('--no_objects', default=True, action="store_false", help="Do not generate/clear previews for object IDs.")
parser.add_argument('--no_data_intern', default=True, action="store_false",
help="Do not generate/clear previews for mat/tex/image/etc. IDs (those handled by core Blender code).")
- args = parser.parse_args()
+ args = parser.parse_args(argv)
if args.clear:
+ print("clear!")
do_clear_previews(do_objects=args.no_objects, do_groups=args.no_groups, do_scenes=args.no_scenes,
do_data_intern=args.no_data_intern)
else:
+ print("render!")
do_previews(do_objects=args.no_objects, do_groups=args.no_groups, do_scenes=args.no_scenes,
do_data_intern=args.no_data_intern)
- sys.argv = back_argv
-
if __name__ == "__main__":
print("\n\n *** Running {} *** \n".format(__file__))
diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py
index d3c1d33..f27df20 100644
--- a/release/scripts/startup/bl_operators/file.py
+++ b/release/scripts/startup/bl_operators/file.py
@@ -85,7 +85,6 @@ class WM_OT_previews_batch_generate(Operator):
"--python",
os.path.join(os.path.dirname(preview_render.__file__), "bl_previews_render.py"),
"--",
- "bl_previews_render.py", # arg parser expects first arg to be prog name!
]
if not self.use_scenes:
cmmd.append('--no_scenes')
@@ -162,7 +161,6 @@ class WM_OT_previews_batch_clear(Operator):
"--python",
os.path.join(os.path.dirname(preview_render.__file__), "bl_previews_render.py"),
"--",
- "bl_previews_render.py", # arg parser expects first arg to be prog name!
"--clear",
]
if not self.use_scenes:
More information about the Bf-blender-cvs
mailing list