[Bf-blender-cvs] [df65d0b9548] temp-workspace-addons: Merge branch 'blender2.8' into temp-workspace-addons

[Campbell Barton]

Commit: df65d0b9548ee8a0063eaff7ad3aa7e401602819
Author: Campbell Barton
Date:   Thu Feb 1 15:03:39 2018 +1100
Branches: temp-workspace-addons
https://developer.blender.org/rBdf65d0b9548ee8a0063eaff7ad3aa7e401602819

Merge branch 'blender2.8' into temp-workspace-addons

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 8fbc781b6c8,ae5578b1f98..d3be3341b7a
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -946,8 -950,8 +950,8 @@@ class USERPREF_PT_theme(Panel)
          elif theme.theme_area == 'BONE_COLOR_SETS':
              col = split.column()
  
-             for i, ui in enumerate(theme.bone_color_sets):
-                 col.label(text=iface_("Color Set %d:") % (i + 1), translate=False)  # i starts from 0
+             for i, ui in enumerate(theme.bone_color_sets, 1):
 -                col.label(text=iface_("Color Set %d:") % 1, translate=False)
++                col.label(text=iface_("Color Set %d:") % i, translate=False)
  
                  row = col.row()
  
@@@ -1386,7 -1391,8 +1393,8 @@@ class USERPREF_PT_addons(Panel)
          # collect the categories that can be filtered on
          addons = [
              (mod, addon_utils.module_bl_info(mod))
-             for mod in addon_utils.modules(addon_collection=addon_collection, refresh=False)]
 -            for mod in addon_utils.modules(refresh=False)
++            for mod in addon_utils.modules(addon_collection=addon_collection, refresh=False)
+         ]
  
          split = layout.split(percentage=0.2)
          col = split.column()