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

@@ -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
-		
-		if coll:
-			settings = context.object.collision
+			settings = None
 		
+		if settings:
 			layout.active = settings.enabled
 		
 			split = layout.split()

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()