diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-06 02:57:58 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-06 02:57:58 +0400 |
commit | 8a20433f0fef5ab2d881d010cd5bd19fe484e555 (patch) | |
tree | cd9e8f67eb2d4d16d1b62244025db41cd342e805 /release/scripts/ui/properties_object.py | |
parent | a1d0913afe228aa55c47eea2d3ffd617df67fcc0 (diff) | |
parent | 09e6190b490213851711ea7356e76142f527a523 (diff) |
Merged changes in the trunk up to revision 28600.
Diffstat (limited to 'release/scripts/ui/properties_object.py')
-rw-r--r-- | release/scripts/ui/properties_object.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index 7169d936904..043a0d2434b 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -155,13 +155,11 @@ class OBJECT_PT_groups(ObjectButtonsPanel): ob = context.object wide_ui = context.region.width > narrowui - if wide_ui: - split = layout.split() - split.operator_menu_enum("object.group_add", "group") - split.label() - else: - layout.operator_menu_enum("object.group_add", "group") + split = layout.split(percentage=0.8, align=True) + split.operator("object.group_link", text="Link to Group") + split.operator("object.group_add", text="", icon='ZOOMIN') + # XXX, this is bad practice, yes, I wrote it :( - campbell index = 0 value = str(tuple(context.scene.cursor_location)) for group in bpy.data.groups: |