Revision: 23216 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23216 Author: blendix Date: 2009-09-14 14:16:35 +0200 (Mon, 14 Sep 2009)
Log Message: ----------- 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. Modified Paths: -------------- trunk/blender/release/ui/buttons_physics_field.py trunk/blender/release/ui/space_view3d.py Modified: trunk/blender/release/ui/buttons_physics_field.py =================================================================== --- trunk/blender/release/ui/buttons_physics_field.py 2009-09-14 12:05:51 UTC (rev 23215) +++ trunk/blender/release/ui/buttons_physics_field.py 2009-09-14 12:16:35 UTC (rev 23216) @@ -184,18 +184,16 @@ #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() Modified: trunk/blender/release/ui/space_view3d.py =================================================================== --- trunk/blender/release/ui/space_view3d.py 2009-09-14 12:05:51 UTC (rev 23215) +++ trunk/blender/release/ui/space_view3d.py 2009-09-14 12:16:35 UTC (rev 23216) @@ -34,6 +34,8 @@ 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() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs