Merge branch 'master' into blender2.8

2017-06-01 16:31:56 +02:00
parent 3bc8e88643 e5d8b04abe
commit 237e17a957
51 changed files with 733 additions and 1159 deletions
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -294,7 +294,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):

        ob = context.object

-        layout.prop(ob, "dupli_type", expand=True)
+        layout.row().prop(ob, "dupli_type", expand=True)

        if ob.dupli_type == 'FRAMES':
            split = layout.split()