Moved the definitions of Freestyle-specific panels to its own module.

Suggested by Sergey Sharybin through a code review of the branch.

1 files changed, 8 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 6bda65dba06..868fa2a311c 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -24,7 +24,7 @@ if "bpy" in locals():
     from imp import reload as _reload
     for val in _modules_loaded.values():
         _reload(val)
-_modules = (
+_modules = [
     "properties_animviz",
     "properties_constraint",
     "properties_data_armature",
@@ -75,16 +75,18 @@ _modules = (
     "space_userpref",
     "space_view3d",
     "space_view3d_toolbar",
-)
+]
+
+import bpy
+
+if bpy.app.build_options.freestyle:
+    _modules.append("properties_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__)