Merge branch 'master' into blender2.8

1 files changed, 28 insertions, 23 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index deeed2d1c05..79d044c25bf 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -109,17 +109,21 @@ def register():
             register_class(cls)
 
     # space_userprefs.py
-    from bpy.props import StringProperty, EnumProperty
+    from bpy.props import (
+        EnumProperty,
+        StringProperty,
+    )
     from bpy.types import WindowManager
 
     def addon_filter_items(self, context):
         import addon_utils
 
-        items = [('All', "All", "All Add-ons"),
-                 ('User', "User", "All Add-ons Installed by User"),
-                 ('Enabled', "Enabled", "All Enabled Add-ons"),
-                 ('Disabled', "Disabled", "All Disabled Add-ons"),
-                 ]
+        items = [
+            ('All', "All", "All Add-ons"),
+            ('User', "User", "All Add-ons Installed by User"),
+            ('Enabled', "Enabled", "All Enabled Add-ons"),
+            ('Disabled', "Disabled", "All Disabled Add-ons"),
+        ]
 
         items_unique = set()
 
@@ -131,26 +135,27 @@ def register():
         return items
 
     WindowManager.addon_search = StringProperty(
-            name="Search",
-            description="Search within the selected filter",
-            options={'TEXTEDIT_UPDATE'},
-            )
+        name="Search",
+        description="Search within the selected filter",
+        options={'TEXTEDIT_UPDATE'},
+    )
     WindowManager.addon_filter = EnumProperty(
-            items=addon_filter_items,
-            name="Category",
-            description="Filter add-ons by category",
-            )
+        items=addon_filter_items,
+        name="Category",
+        description="Filter add-ons by category",
+    )
 
     WindowManager.addon_support = EnumProperty(
-            items=[('OFFICIAL', "Official", "Officially supported"),
-                   ('COMMUNITY', "Community", "Maintained by community developers"),
-                   ('TESTING', "Testing", "Newly contributed scripts (excluded from release builds)")
-                   ],
-            name="Support",
-            description="Display support level",
-            default={'OFFICIAL', 'COMMUNITY'},
-            options={'ENUM_FLAG'},
-            )
+        items=[
+            ('OFFICIAL', "Official", "Officially supported"),
+            ('COMMUNITY', "Community", "Maintained by community developers"),
+            ('TESTING', "Testing", "Newly contributed scripts (excluded from release builds)")
+        ],
+        name="Support",
+        description="Display support level",
+        default={'OFFICIAL', 'COMMUNITY'},
+        options={'ENUM_FLAG'},
+    )
     # done...