Merge branch 'master' into blender2.8

2018-06-26 22:56:39 +02:00
parent a3cd57ea8c 532c8ac583
commit a61480c271
68 changed files with 1554 additions and 1454 deletions
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -23,7 +23,7 @@ from bpy.types import Header, Menu, Panel
 from .space_dopesheet import (
    DopesheetFilterPopoverBase,
    dopesheet_filter,
-    )
+)


 class NLA_HT_header(Header):
@@ -37,11 +37,13 @@ class NLA_HT_header(Header):
        row = layout.row(align=True)
        row.template_header()

-        layout.popover(space_type='NLA_EDITOR',
-                       region_type='HEADER',
-                       panel_type="NLA_PT_filters",
-                       text="",
-                       icon='FILTER')
+        layout.popover(
+            space_type='NLA_EDITOR',
+            region_type='HEADER',
+            panel_type="NLA_PT_filters",
+            text="",
+            icon='FILTER',
+        )

        NLA_MT_editor_menus.draw_collapsible(context, layout)