[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39147] branches/soc-2011-pepper: Merging trunk up to r39145.

Joerg Mueller nexyon at gmail.com
Sun Aug 7 17:25:06 CEST 2011


Revision: 39147
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39147
Author:   nexyon
Date:     2011-08-07 15:25:06 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Merging trunk up to r39145.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39145

Modified Paths:
--------------
    branches/soc-2011-pepper/CMakeLists.txt
    branches/soc-2011-pepper/SConstruct
    branches/soc-2011-pepper/build_files/buildbot/master.cfg
    branches/soc-2011-pepper/build_files/buildbot/slave_compile.py
    branches/soc-2011-pepper/build_files/buildbot/slave_pack.py
    branches/soc-2011-pepper/build_files/scons/config/darwin-config.py
    branches/soc-2011-pepper/doc/python_api/rst/bge.constraints.rst
    branches/soc-2011-pepper/doc/python_api/rst/bge.texture.rst
    branches/soc-2011-pepper/doc/python_api/rst/bgl.rst
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManagerWin32.h
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2011-pepper/release/scripts/modules/addon_utils.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-pepper/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-pepper/source/blender/blenloader/BLO_readfile.h
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-pepper/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-pepper/source/blender/editors/curve/editfont.c
    branches/soc-2011-pepper/source/blender/editors/include/UI_interface.h
    branches/soc-2011-pepper/source/blender/editors/include/UI_resources.h
    branches/soc-2011-pepper/source/blender/editors/interface/interface.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_style.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-pepper/source/blender/editors/interface/resources.c
    branches/soc-2011-pepper/source/blender/editors/object/object_edit.c
    branches/soc-2011-pepper/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-pepper/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-pepper/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-pepper/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-pepper/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-pepper/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-pepper/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_library.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.h
    branches/soc-2011-pepper/source/blender/windowmanager/WM_api.h
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-pepper/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-pepper/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Added Paths:
-----------
    branches/soc-2011-pepper/source/blender/windowmanager/WM_keymap.h

Property Changed:
----------------
    branches/soc-2011-pepper/
    branches/soc-2011-pepper/source/tools/MakeGLStipple.py


Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36830-38981
   + /trunk/blender:36830-39145

Modified: branches/soc-2011-pepper/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/CMakeLists.txt	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/CMakeLists.txt	2011-08-07 15:25:06 UTC (rev 39147)
@@ -998,9 +998,28 @@
 		elseif(WITH_CODEC_QUICKTIME)
 			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
 		endif()
+
+		# XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED! 
+		# ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+		if(WITH_INPUT_NDOF)
+			# This thread it *should* work and check the framework - campbell
+			# http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+			find_library(3D_CONNEXION_CLIENT_LIBRARY
+				NAMES 3DconnexionClient
+			)
+			if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
+				set(WITH_INPUT_NDOF OFF)
+			endif()
+
+			if(WITH_INPUT_NDOF)
+				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient")
+			endif()
+		endif()
+
 	else()
 		set(PLATFORM_CFLAGS "-pipe -funsigned-char")
 		set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+		set(WITH_INPUT_NDOF OFF)  # unsupported
 	endif()
 
 	if(WITH_OPENCOLLADA)

Modified: branches/soc-2011-pepper/SConstruct
===================================================================
--- branches/soc-2011-pepper/SConstruct	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/SConstruct	2011-08-07 15:25:06 UTC (rev 39147)
@@ -253,7 +253,16 @@
         if k not in B.arguments:
             env[k] = v
 
+# detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX
+if env['OURPLATFORM']=='darwin':
+    envi = Environment()
+    conf = Configure(envi)
+    if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it is c++ !
+        print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+        env['WITH_BF_3DMOUSE'] = 0
+    envi = conf.Finish()
 
+
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')

Modified: branches/soc-2011-pepper/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/master.cfg	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/build_files/buildbot/master.cfg	2011-08-07 15:25:06 UTC (rev 39147)
@@ -116,6 +116,7 @@
 add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
 add_builder(c, 'win32_scons', 'windows', generic_builder)
 add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
+add_builder(c, 'win64_scons', 'windows', generic_builder)
 #add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
 #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 

Modified: branches/soc-2011-pepper/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/slave_compile.py	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/build_files/buildbot/slave_compile.py	2011-08-07 15:25:06 UTC (rev 39147)
@@ -108,12 +108,14 @@
 
         sys.exit(0)
     else:
+        bitness = '32'
         # Switch to new FFmpeg library
         if builder.find('win') != -1:
             if builder.find('win32') != -1:
                 LCGDIR = '#../lib/windows'
             elif builder.find('win64') != -1:
                 LCGDIR = '#../lib/win64'
+                bitness = '64'
 
             all_ffmpeg_libs = ['avcodec-53',
                                'avdevice-53',
@@ -126,11 +128,13 @@
 
             for lib in all_ffmpeg_libs:
                 ffmpeg_lib.append(lib + '.lib')
-                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.lib')
+                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
 
             scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
+            scons_options.append('BF_BITNESS='+bitness)
+
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)

Modified: branches/soc-2011-pepper/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/slave_pack.py	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/build_files/buildbot/slave_pack.py	2011-08-07 15:25:06 UTC (rev 39147)
@@ -72,12 +72,14 @@
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
     else:
+        bitness = '32'
         # Switch to new FFmpeg library
         if builder.find('win') != -1:
             if builder.find('win32') != -1:
                 LCGDIR = '#../lib/windows'
             elif builder.find('win64') != -1:
                 LCGDIR = '#../lib/win64'
+                bitness = '64'
 
             all_ffmpeg_libs = ['avcodec-53',
                                'avdevice-53',
@@ -90,12 +92,14 @@
 
             for lib in all_ffmpeg_libs:
                 ffmpeg_lib.append(lib + '.lib')
-                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.lib')
+                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
 
             scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
             scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
             scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
 
+            scons_options.append('BF_BITNESS='+bitness)
+
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
 

Modified: branches/soc-2011-pepper/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-pepper/build_files/scons/config/darwin-config.py	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/build_files/scons/config/darwin-config.py	2011-08-07 15:25:06 UTC (rev 39147)
@@ -21,14 +21,17 @@
 MAC_PROC=commands.getoutput(cmd) 
 cmd = 'uname -r'
 cmd_res=commands.getoutput(cmd) 
-if cmd_res[0]=='7':
+MAC_CUR_VER='10.5' # by default (test below fails on my 10.5 PowerPC)
+if cmd_res[:2]=='7':
 	MAC_CUR_VER='10.3'
-elif cmd_res[0]=='8':
+elif cmd_res[:2]=='8':
 	MAC_CUR_VER='10.4'
-elif cmd_res[0]=='9':
+elif cmd_res[:2]=='9':
 	MAC_CUR_VER='10.5'
-elif cmd_res[0]=='10':
+elif cmd_res[:2]=='10':
 	MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+	MAC_CUR_VER='10.7'
 
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
 	USE_QTKIT=True # Carbon quicktime is not available for 64bit
@@ -37,8 +40,8 @@
 # Default target OSX settings per architecture
 # Can be customized
 
-if MACOSX_ARCHITECTURE == 'ppc':
-# ppc release are now made for 10.4
+if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
+# all releases are now made for 10.5 !
 #	MAC_MIN_VERS = '10.3'
 #	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
 #	LCGDIR = '#../lib/darwin-6.1-powerpc'
@@ -50,13 +53,21 @@
 	LCGDIR = '#../lib/darwin-8.0.0-powerpc'
 	CC = 'gcc-4.0'
 	CXX = 'g++-4.0'
-elif MACOSX_ARCHITECTURE == 'i386':
+elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
 	MAC_MIN_VERS = '10.4'
 	MACOSX_DEPLOYMENT_TARGET = '10.4'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
 	LCGDIR = '#../lib/darwin-8.x.i386'
 	CC = 'gcc-4.0'
 	CXX = 'g++-4.0'
+elif MAC_CUR_VER >= '10.6':
+	# OSX 10.6 and 10.7 developer tools do not come with sdk < 10.6 anymore !
+	MAC_MIN_VERS = '10.6'
+	MACOSX_DEPLOYMENT_TARGET = '10.6'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+	LCGDIR = '#../lib/darwin-9.x.universal'
+	CC = 'llvm-gcc-4.2'
+	CXX = 'llvm-g++-4.2'
 else :
 	MAC_MIN_VERS = '10.5'
 	MACOSX_DEPLOYMENT_TARGET = '10.5'
@@ -71,8 +82,8 @@
 ###################          Dependency settings           ##################
 #############################################################################
 
-#Defaults openMP to true if compiler (currently only gcc 4.2) handles it
-if CC == 'gcc-4.2':
+#Defaults openMP to true if compiler handles it
+if CC == 'gcc-4.2' or CC == 'llvm-gcc-4.2':
     WITH_BF_OPENMP = True  # multithreading for fluids, cloth and smoke
 else:
     WITH_BF_OPENMP = False
@@ -266,7 +277,7 @@
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
 
 # SpaceNavigator and related 3D mice
-WITH_BF_3DMOUSE = True
+WITH_BF_3DMOUSE = False
 
 #############################################################################
 ###################  various compile settings and flags    ##################

Modified: branches/soc-2011-pepper/doc/python_api/rst/bge.constraints.rst
===================================================================
--- branches/soc-2011-pepper/doc/python_api/rst/bge.constraints.rst	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/doc/python_api/rst/bge.constraints.rst	2011-08-07 15:25:06 UTC (rev 39147)
@@ -2,6 +2,10 @@
 Physics Constraints (bge.constraints)
 =====================================
 
+.. module:: bge.constraints
+
+.. literalinclude:: ../examples/bge.constraints.py
+
 .. function:: createConstraint(physicsid, physicsid2, constrainttype, [pivotX, pivotY, pivotZ, [axisX, axisY, axisZ, [flag]]]])
 
    Creates a constraint.

Modified: branches/soc-2011-pepper/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/soc-2011-pepper/doc/python_api/rst/bge.texture.rst	2011-08-07 15:25:05 UTC (rev 39146)
+++ branches/soc-2011-pepper/doc/python_api/rst/bge.texture.rst	2011-08-07 15:25:06 UTC (rev 39147)
@@ -36,6 +36,10 @@
 
 .. module:: bge.texture
 
+.. literalinclude:: ../examples/bge.texture.py
+
+.. literalinclude:: ../examples/bge.texture.1.py
+
 .. class:: VideoFFmpeg(file [, capture=-1, rate=25.0, width=0, height=0])
 
    FFmpeg video source


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list