diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /release/scripts/startup/bl_operators/__init__.py | |
parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'release/scripts/startup/bl_operators/__init__.py')
-rw-r--r-- | release/scripts/startup/bl_operators/__init__.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py index 0ecb0d46c5f..897dd24e174 100644 --- a/release/scripts/startup/bl_operators/__init__.py +++ b/release/scripts/startup/bl_operators/__init__.py @@ -22,12 +22,11 @@ if "bpy" in locals(): from imp import reload as _reload for val in _modules_loaded.values(): _reload(val) -_modules = ( +_modules = [ "add_mesh_torus", "anim", "clip", "console", - "freestyle", "image", "mesh", "node", @@ -44,16 +43,18 @@ _modules = ( "vertexpaint_dirt", "view3d", "wm", -) +] + +import bpy + +if 'FREESTYLE' in bpy.app.build_options: + _modules.append("freestyle") __import__(name=__name__, fromlist=_modules) _namespace = globals() -_modules_loaded = {name: _namespace[name] for name in _modules} +_modules_loaded = {name: _namespace[name] for name in _modules if name != 'bpy'} del _namespace -import bpy - - def register(): bpy.utils.register_module(__name__) |