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__)