remove -Wnested-externs warning for CMake/unix, since this is used a lot, if we want to remove it can be re-enabled.

fix view3d python errors with no object/edit object.

1 files changed, 11 insertions, 8 deletions

diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index ae04c8875ce..f9e185f44f2 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -27,15 +27,18 @@ class VIEW3D_HT_header(bpy.types.Header):
 			if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
 				# XXX: Particle Mode has Select Menu.
 				sub.itemM("VIEW3D_MT_select_%s" % mode_string)
-				
-			if object.mode == 'OBJECT':
-				sub.itemM("VIEW3D_MT_object")
-			elif object.mode == 'SCULPT':
-				sub.itemM("VIEW3D_MT_sculpt")
-			elif object.mode == 'VERTEX_PAINT':
-				sub.itemM("VIEW3D_MT_vertex_paint")
-			elif object.mode:
+			
+			if edit_object:
 				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
+			elif object:
+				ob_mode_string = object.mode
+				
+				if ob_mode_string == 'OBJECT':
+					sub.itemM("VIEW3D_MT_object")
+				elif ob_mode_string == 'SCULPT':
+					sub.itemM("VIEW3D_MT_sculpt")
+				elif ob_mode_string == 'VERTEX_PAINT':
+					sub.itemM("VIEW3D_MT_vertex_paint")
 
 		layout.template_header_3D()