Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-14 16:16:35 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-14 16:16:35 +0400
commit75d4a836b8427f1d71f41d037390352bffeafee4 (patch)
tree73ffd2b278d1eacb2f9a7f88494e4a1e0f6fbaf7
parentd0aa03737eff52b1c54644cb5e9d3d68daa2986c (diff)
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.
-rw-r--r--release/ui/buttons_physics_field.py8
-rw-r--r--release/ui/space_view3d.py2
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()