[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22696] branches/blender2.5/blender: remove -Wnested-externs warning for CMake/unix, since this is used a lot, if we want to remove it can be re-enabled.

[Campbell Barton]

Revision: 22696
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22696
Author:   campbellbarton
Date:     2009-08-22 07:46:03 +0200 (Sat, 22 Aug 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/release/ui/space_view3d.py

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-08-22 04:45:19 UTC (rev 22695)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-08-22 05:46:03 UTC (rev 22696)
@@ -72,6 +72,7 @@
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
+# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -212,7 +213,7 @@
   SET(PLATFORM_LINKFLAGS "-pthread")
 
   # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
   SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
@@ -511,6 +512,17 @@
   SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
+
+# TODO - buildinfo
+# IF(UNIX)
+#   IF(WITH_BUILDINFO)
+#     EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
+#     EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
+#     EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+#   ENDIF(WITH_BUILDINFO)
+# ENDIF(UNIX)
+
 #-----------------------------------------------------------------------------
 # Common.
 

Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py	2009-08-22 04:45:19 UTC (rev 22695)
+++ branches/blender2.5/blender/release/ui/space_view3d.py	2009-08-22 05:46:03 UTC (rev 22696)
@@ -27,15 +27,18 @@
 			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 edit_object:
+				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
+			elif object:
+				ob_mode_string = object.mode
 				
-			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:
-				sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type)
+				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()