Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton
2017-03-12 03:00:06 +11:00
60 changed files with 873 additions and 336 deletions

View File

@@ -128,16 +128,15 @@ def draw_kmi(display_keymaps, kc, km, kmi, layout, level):
else:
box = col.column()
split = box.split(percentage=0.01)
split = box.split()
# header bar
row = split.row()
row = split.row(align=True)
row.prop(kmi, "show_expanded", text="", emboss=False)
row = split.row()
row.prop(kmi, "active", text="", emboss=False)
if km.is_modal:
row.separator()
row.prop(kmi, "propvalue", text="")
else:
row.label(text=kmi.name)