From 75d4a836b8427f1d71f41d037390352bffeafee4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 14 Sep 2009 12:16:35 +0000 Subject: [PATCH] UI: don't hide Object menu in 3d view header when there is no active object, to avoid buttons jumping too much. Also small change in collision panel code. --- release/ui/buttons_physics_field.py | 8 +++----- release/ui/space_view3d.py | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py index 58033d2c431..252b3bdb08a 100644 --- a/release/ui/buttons_physics_field.py +++ b/release/ui/buttons_physics_field.py @@ -184,18 +184,16 @@ class PHYSICS_PT_collision(PhysicButtonsPanel): #row.itemR(md, "render", text="") #row.itemR(md, "realtime", text="") - coll = md.settings + settings = md.settings else: # add modifier split.item_enumO("object.modifier_add", "type", 'COLLISION', text="Add") split.itemL() - coll = None + settings = None - if coll: - settings = context.object.collision - + if settings: layout.active = settings.enabled split = layout.split() diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py index df6579542d4..2539ded18bf 100644 --- a/release/ui/space_view3d.py +++ b/release/ui/space_view3d.py @@ -34,6 +34,8 @@ class VIEW3D_HT_header(bpy.types.Header): if mode_string not in ['PAINT_WEIGHT', 'PAINT_TEXTURE']: sub.itemM("VIEW3D_MT_%s" % mode_string) + else: + sub.itemM("VIEW3D_MT_OBJECT") layout.template_header_3D()